tor-commits July 2020

tor-commits@lists.torproject.org

17 participants
2100 discussions

[snowflake-mobile/master] Updating the count of users served even when the app is in foreground
by cohosh＠torproject.org 20 Jul '20

20 Jul '20

commit 689949d23d06a089e620b3703008ba2c60b36762 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Fri Jul 17 22:28:47 2020 +0530 Updating the count of users served even when the app is in foreground --- .../org/torproject/snowflake/MainActivity.java | 44 +++++++++++++++++++--- 1 file changed, 39 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/torproject/snowflake/MainActivity.java b/app/src/main/java/org/torproject/snowflake/MainActivity.java index 65480cc..293f539 100644 --- a/app/src/main/java/org/torproject/snowflake/MainActivity.java +++ b/app/src/main/java/org/torproject/snowflake/MainActivity.java @@ -41,6 +41,7 @@ public class MainActivity extends AppCompatActivity implements MainFragmentCallb private SharedPreferences sharedPreferences; private Button settingsButton; private Disposable disposable; + private SharedPreferences.OnSharedPreferenceChangeListener listener; @Override protected void onCreate(Bundle savedInstanceState) { @@ -59,11 +60,8 @@ public class MainActivity extends AppCompatActivity implements MainFragmentCallb //By this point the servedCount must be reset or left as is after checking the dates. servedCount = sharedPreferences.getInt(getString(R.string.users_served), 0); - Fragment mainFragment = getSupportFragmentManager().findFragmentByTag(Integer.toString(FragmentConstants.MAIN_FRAGMENT)); - //If the fragment is in foreground update the count. Or else ignore. - if (mainFragment != null) { - ((MainFragment) mainFragment).showServed(); - } + setListenerForCount(); + updateCountInFragment(); }); //Creating notification channel if app is being run for the first time @@ -85,6 +83,40 @@ public class MainActivity extends AppCompatActivity implements MainFragmentCallb startFragment(MainFragment.newInstance()); } + /** + * Updates the users served count in the text-view of MainFragment if it's in the foreground or else It'll ignore. + */ + private void updateCountInFragment() { + Log.d(TAG, "updateCountInFragment: Updating count"); + + Fragment mainFragment = getSupportFragmentManager().findFragmentByTag(Integer.toString(FragmentConstants.MAIN_FRAGMENT)); + //If the fragment is in foreground update the count. Or else ignore. + if (mainFragment != null) { + ((MainFragment) mainFragment).showServed(); + } + } + + /** + * Used to update the count without restarting the app to update the users served count. + * Listener is set on the file to check for changes. + */ + private void setListenerForCount() { + Log.d(TAG, "setListenerForCount: Setting listener"); + + // Do NOT make the variable local. SP listener listens on WeakHashMap. + // It'll get garbage collected as soon as code leaves the scope. Hence listener won't work. + listener = (prefs, key) -> { + Log.d(TAG, "setListenerForCount: Listener: Key = " + key); + + if (key.equals(getString(R.string.users_served))) { + servedCount = sharedPreferences.getInt(key, 0); + updateCountInFragment(); + } + }; + + sharedPreferences.registerOnSharedPreferenceChangeListener(listener); + } + /** * Used to replace the fragment in the "fragment_container" * @@ -218,6 +250,8 @@ public class MainActivity extends AppCompatActivity implements MainFragmentCallb protected void onDestroy() { //Killing of thread disposable.dispose(); + //Unregistering the listener. + sharedPreferences.unregisterOnSharedPreferenceChangeListener(listener); super.onDestroy(); } }

1 0

[snowflake-mobile/master] Refactored .xml MainFragment code
by cohosh＠torproject.org 20 Jul '20

20 Jul '20

commit ab9b4f1dd3c021ef139945c493a02a104b1d815e Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Sat Jul 11 03:04:40 2020 +0530 Refactored .xml MainFragment code --- .../main/java/org/torproject/snowflake/fragments/MainFragment.java | 3 +-- app/src/main/res/layout/fragment_main_fragment.xml | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java b/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java index be71745..d45a216 100644 --- a/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java +++ b/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java @@ -2,7 +2,6 @@ package org.torproject.snowflake.fragments; import android.content.Context; import android.os.Bundle; -import android.text.Layout; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -79,7 +78,7 @@ public class MainFragment extends Fragment { int served = callback.getServed(); Log.d(TAG, "showServed: " + served); - if(served > 0){ + if (served > 0) { usersServedTV.setVisibility(View.VISIBLE); usersServedTV.setText(getString(R.string.users_served_text) + served); } diff --git a/app/src/main/res/layout/fragment_main_fragment.xml b/app/src/main/res/layout/fragment_main_fragment.xml index d7f2bd9..f6b4c4d 100644 --- a/app/src/main/res/layout/fragment_main_fragment.xml +++ b/app/src/main/res/layout/fragment_main_fragment.xml @@ -20,10 +20,10 @@ android:layout_height="wrap_content" android:layout_below="@id/start_button" android:layout_centerHorizontal="true" - android:paddingTop="10dp" + android:gravity="center" android:paddingLeft="50dp" + android:paddingTop="10dp" android:paddingRight="50dp" - android:gravity="center" android:visibility="gone" /> </RelativeLayout> \ No newline at end of file

1 0

[snowflake-mobile/master] Moved and renamed String.xml SharedPreference keys
by cohosh＠torproject.org 20 Jul '20

20 Jul '20

commit dafed99d20b0ca398a04c2c8db5f3e24c995893d Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Sat Jul 18 00:01:14 2020 +0530 Moved and renamed String.xml SharedPreference keys --- .../java/org/torproject/snowflake/MainActivity.java | 20 ++++++++++---------- .../torproject/snowflake/MyPersistentService.java | 10 +++++----- app/src/main/res/values/strings.xml | 5 ----- app/src/main/res/values/strings_preference_keys.xml | 8 ++++++++ 4 files changed, 23 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/org/torproject/snowflake/MainActivity.java b/app/src/main/java/org/torproject/snowflake/MainActivity.java index 293f539..69948a5 100644 --- a/app/src/main/java/org/torproject/snowflake/MainActivity.java +++ b/app/src/main/java/org/torproject/snowflake/MainActivity.java @@ -58,17 +58,17 @@ public class MainActivity extends AppCompatActivity implements MainFragmentCallb .observeOn(AndroidSchedulers.mainThread()) .subscribe((status) -> { //Runs on main thread //By this point the servedCount must be reset or left as is after checking the dates. - servedCount = sharedPreferences.getInt(getString(R.string.users_served), 0); + servedCount = sharedPreferences.getInt(getString(R.string.users_served_key), 0); setListenerForCount(); updateCountInFragment(); }); //Creating notification channel if app is being run for the first time - if (sharedPreferences.getBoolean(getString(R.string.initial_run_boolean), true)) { + if (sharedPreferences.getBoolean(getString(R.string.initial_run_boolean_key), true)) { createNotificationChannel(); //Setting initial run to false. - sharedPreferences.edit().putBoolean(getString(R.string.initial_run_boolean), false).apply(); + sharedPreferences.edit().putBoolean(getString(R.string.initial_run_boolean_key), false).apply(); } settingsButton.setOnClickListener(new View.OnClickListener() { @@ -108,7 +108,7 @@ public class MainActivity extends AppCompatActivity implements MainFragmentCallb listener = (prefs, key) -> { Log.d(TAG, "setListenerForCount: Listener: Key = " + key); - if (key.equals(getString(R.string.users_served))) { + if (key.equals(getString(R.string.users_served_key))) { servedCount = sharedPreferences.getInt(key, 0); updateCountInFragment(); } @@ -158,7 +158,7 @@ public class MainActivity extends AppCompatActivity implements MainFragmentCallb * @return boolean whether the service is running or not. */ public boolean isServiceRunning() { - return sharedPreferences.getBoolean(getString(R.string.is_service_running_bool), false); + return sharedPreferences.getBoolean(getString(R.string.is_service_running_bool_key), false); } /** @@ -202,12 +202,12 @@ public class MainActivity extends AppCompatActivity implements MainFragmentCallb try { String stringCurrentDate = simpleDateFormat.format(Calendar.getInstance().getTime()); - String stringRecordedDate = sharedPreferences.getString(getString(R.string.served_date), ""); + String stringRecordedDate = sharedPreferences.getString(getString(R.string.served_date_key), ""); //No value for key. Set the date value to current date and users served to 0. if (stringRecordedDate.equals("")) { - editor.putString(getString(R.string.served_date), stringCurrentDate); - editor.putInt(getString(R.string.users_served), 0); + editor.putString(getString(R.string.served_date_key), stringCurrentDate); + editor.putInt(getString(R.string.users_served_key), 0); } else { //Check if the current system date is greater than recorded date, if so reset the "served" flag. Date recordedDate = simpleDateFormat.parse(stringRecordedDate); @@ -221,8 +221,8 @@ public class MainActivity extends AppCompatActivity implements MainFragmentCallb return true; } else { //Current date is bigger than recorded date. Reset the values. i.e comparision > 0 - editor.putString(getString(R.string.served_date), simpleDateFormat.format(currentDate)); - editor.putInt(getString(R.string.users_served), 0); + editor.putString(getString(R.string.served_date_key), simpleDateFormat.format(currentDate)); + editor.putInt(getString(R.string.users_served_key), 0); } } diff --git a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java index 20f0a47..c8c2304 100644 --- a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java +++ b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java @@ -80,7 +80,7 @@ public class MyPersistentService extends Service { public int onStartCommand(Intent intent, int flags, int startId) { Log.d(TAG, "onStartCommand: executed with startId: " + startId); sharedPreferences = getSharedPreferences(getString(R.string.sharedpreference_file), MODE_PRIVATE); - isServiceStarted = sharedPreferences.getBoolean(getString(R.string.is_service_running_bool), false); + isServiceStarted = sharedPreferences.getBoolean(getString(R.string.is_service_running_bool_key), false); if (intent != null) { if (intent.getAction().equals(ForegroundServiceConstants.ACTION_START)) @@ -132,10 +132,10 @@ public class MyPersistentService extends Service { if (setState == ForegroundServiceConstants.SERVICE_RUNNING) { isServiceStarted = true; - editor.putBoolean(getString(R.string.is_service_running_bool), true); + editor.putBoolean(getString(R.string.is_service_running_bool_key), true); } else { isServiceStarted = false; - editor.putBoolean(getString(R.string.is_service_running_bool), false); + editor.putBoolean(getString(R.string.is_service_running_bool_key), false); } editor.apply(); } @@ -146,8 +146,8 @@ public class MyPersistentService extends Service { private void updateServedCount() { SharedPreferences sp = GlobalApplication.getAppPreferences(); sp.edit() - .putInt(getString(R.string.users_served), - sp.getInt(getString(R.string.users_served), 0) + 1) + .putInt(getString(R.string.users_served_key), + sp.getInt(getString(R.string.users_served_key), 0) + 1) .apply(); } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 68b36a1..856c648 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,11 +1,6 @@ <resources> <string name="app_name">Snowflake</string> - <string name="sharedpreference_file">org.torproject.snowflake.snowflake_preferences</string> - <string name="is_service_running_bool">is_service_running</string> <string name="not_channel_desc">This Channel should not be muted. The Android system will consider Snowflake not import and will kill the service if it\'s muted.</string> - <string name="initial_run_boolean">initial_run</string> <string name="not_channel_name">Snowflake Service</string> - <string name="users_served">users_served</string> - <string name="served_date">date</string> <string name="users_served_text">Users you have helped circumvent censorship in the past day \n</string> </resources> diff --git a/app/src/main/res/values/strings_preference_keys.xml b/app/src/main/res/values/strings_preference_keys.xml new file mode 100644 index 0000000..2727405 --- /dev/null +++ b/app/src/main/res/values/strings_preference_keys.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="sharedpreference_file">org.torproject.snowflake.snowflake_preferences</string> + <string name="users_served_key">users_served</string> + <string name="served_date_key">date</string> + <string name="initial_run_boolean_key">initial_run</string> + <string name="is_service_running_bool_key">is_service_running</string> +</resources> \ No newline at end of file

1 0

[chutney/master] Use pathlib Path.rename when renaming pidfile
by nickm＠torproject.org 20 Jul '20

20 Jul '20

commit c9ad298ec414ef991e7b4885c0d623237e0d03cc Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Jul 20 10:53:00 2020 -0400 Use pathlib Path.rename when renaming pidfile Missing artefact from the pathlib migration. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- lib/chutney/TorNet.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index bdb2c0b..c832b9f 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -1209,7 +1209,7 @@ class LocalNodeController(NodeController): if not self.isRunning() and pidfile.exists(): debug("Renaming stale pid file for {} ..." .format(self._env['nick'])) - os.rename(pidfile, pidfile + ".old") + pidfile.rename(pidfile.with_suffix(".old")) def waitOnLaunch(self): """Check whether we can wait() for the tor process to launch"""

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 20 Jul '20

20 Jul '20

commit 9fad9faa69a90fd723d3eef5336e95e8d39115ba Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 20 14:45:13 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+ka.po | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/contents+ka.po b/contents+ka.po index aa42dbad42..ea9f609bf2 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -1489,6 +1489,11 @@ msgid "" "Washington, Northeastern University, Karlstad University, Universitaet " "Stuttgart, and Friedrich-Alexander University Erlangen-Nuremberg." msgstr "" +"ასეთ უნივერსიტეტებს განეკუთვნება მასაჩუსეტსის ტექნოლოგიური ინსტიტუტი (MIT " +"CSAIL), ბოსტონის უნივერსიტეტი, ვატერლოოს უნივერსიტეტი, ვაშინგტონის " +"უნივერსიტეტი, ჩრდილოაღმოსავლეთის უნივერსიტეტი, კარლსტადის უნივერსიტეტი, " +"შტუტგარტის უნივერსიტეტი, ფრიდრიხ-ალექსანდრეს ერლანგენ-ნიურნბერგის " +"უნივერსიტეტი." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1497,6 +1502,9 @@ msgid "" "network, check out EFF's resources: [Tor on " "campus](https://www.eff.org/torchallenge/tor-on-campus.html)." msgstr "" +"ვრცლად თუ გსურთ გაიგოთ, როგორ შეიძლება მხარდაჭერის მიღება გადამცემის " +"გაშვებაში თქვენი უნივერსიტეტის ქსელიდან, გაეცანით EFF-ის მასალებს: [Tor " +"სტუდქალაქიდან](https://www.eff.org/torchallenge/tor-on-campus.html)." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1521,6 +1529,11 @@ msgid "" "Access](https://www.privateinternetaccess.com/), [Boing " "Boing](https://boingboing.net/) and OmuraVPN." msgstr "" +"ზოგიერთ კომპანიასაც აქვს გაშვებული გადამცემები, მათ შორისაა [Brass Horn " +"Communications](https://brasshorncommunications.uk/), [Quintex Alliance " +"Consulting](https://www.quintex.com/), [Private Internet " +"Access](https://www.privateinternetaccess.com/), [Boing " +"Boing](https://boingboing.net/) და OmuraVPN." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1530,6 +1543,10 @@ msgid "" "Digitales](https://tor.derechosdigitales.org), [Enjambre " "Digital](https://tor.enjambre.net/) and Lebanon Libraries in New Hampshire." msgstr "" +"ზოგიერთი დაწესებულებაც უზრუნველყოფს Tor-გადამცემების გაშვებას, ასეთებია " +"Digital Courage, [Access Now](https://www.accessnow.org/), [Derechos " +"Digitales](https://tor.derechosdigitales.org), [Enjambre " +"Digital](https://tor.enjambre.net/) და Lebanon Libraries ნიუ-ჰემფშირში." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1995,6 +2012,8 @@ msgstr "საფრთხეები" msgid "" "Things you should be aware of before running a digital security training." msgstr "" +"გარემოებები, რაც გასათვალისწინებელია, ციფრული უსაფრთხოების გადამზადების " +"დაწყებამდე. " #: https//community.torproject.org/training/risks/ #: (content/training/risks/contents+en.lrpage.body)

1 0

[tor/maint-0.4.4] Use gitlab-friendly URLs when formatting changelogs as HTML
by ahf＠torproject.org 20 Jul '20

20 Jul '20

commit 09601c3c4d468fdafa7aa290dd2b2949bdc5e7e0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 17 09:31:32 2020 -0400 Use gitlab-friendly URLs when formatting changelogs as HTML Our old https://bugs.torproject.org/nnnn URLs only work for bugs numbered before 40000. Newer gitlab bugs need to have specific projects mentioned. This patch assumes that bugs are in tpo/core/tor by default, but allows us to refer to several other projects by saying e.g. "chutney#40002" if we want. --- scripts/maint/format_changelog.py | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/scripts/maint/format_changelog.py b/scripts/maint/format_changelog.py index b37ece04c0..93ab56e257 100755 --- a/scripts/maint/format_changelog.py +++ b/scripts/maint/format_changelog.py @@ -405,10 +405,31 @@ class ChangeLog(object): self.dumpEndOfSections() self.dumpEndOfChangelog() +# Map from issue prefix to pair of (visible prefix, url prefix) +ISSUE_PREFIX_MAP = { + "" : ( "", "tpo/core/tor" ), + "tor#" : ( "", "tpo/core/tor" ), + "chutney#" : ( "chutney#", "tpo/core/chutney" ), + "torspec#" : ( "torspec#", "tpo/core/torspec" ), + "trunnel#" : ( "trunnel#", "tpo/core/trunnel" ), + "torsocks#" : ( "torsocks#", "tpo/core/torsocks"), +} + # Let's turn bugs to html. -BUG_PAT = re.compile('(bug|ticket|issue|feature)\s+(\d{4,5})', re.I) +BUG_PAT = re.compile('(bug|ticket|issue|feature)\s+([\w/]+#)?(\d{4,6})', re.I) def bug_html(m): - return "%s <a href='https://bugs.torproject.org/%s'>%s</a>" % (m.group(1), m.group(2), m.group(2)) + kind = m.group(1) + prefix = m.group(2) or "" + bugno = m.group(3) + try: + disp_prefix, url_prefix = ISSUE_PREFIX_MAP[prefix] + except KeyError: + print("Can't figure out URL for {}{}".formt(prefix,bugno), + file=sys.stderr) + return "{} {}{}".format(kind, prefix, bugno) + + return "{} <a href='https://bugs.torproject.org/{}/{}'>{}{}</a>".format( + kind, url_prefix, bugno, disp_prefix, bugno) class HTMLChangeLog(ChangeLog): def __init__(self, *args, **kwargs):

1 0

[tor/release-0.4.4] Use gitlab-friendly URLs when formatting changelogs as HTML
by ahf＠torproject.org 20 Jul '20

20 Jul '20

1 0

[tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4
by ahf＠torproject.org 20 Jul '20

20 Jul '20

commit 1642612c6edb27b4b777b14316c138f904a6f6b7 Merge: 1e9a87cb92 09601c3c4d Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon Jul 20 14:31:41 2020 +0000 Merge branch 'maint-0.4.4' into release-0.4.4 scripts/maint/format_changelog.py | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-)

1 0

[chutney/master] getTests() must not return the file extension
by nickm＠torproject.org 20 Jul '20

20 Jul '20

commit d0f15258d66fb61eb456ad30346f92a82d040c72 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Jul 20 10:20:53 2020 -0400 getTests() must not return the file extension Before this fix, "verify.py" was listed as the chutney tests and failed to match against the "verify" command passed to chutney. (Edited by Nick, to use pathlib instead of os.path) --- lib/chutney/TorNet.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 2d219ac..bdb2c0b 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -2651,7 +2651,7 @@ def getTests(): chutney_path = get_absolute_chutney_path() chutney_tests_path = chutney_path / "scripts" / "chutney_tests" - return [test.name for test in chutney_tests_path.glob("*.py") + return [test.stem for test in chutney_tests_path.glob("*.py") if not test.name.startswith("_")]

1 0

[tor/master] Add git-resquash.sh to repository
by ahf＠torproject.org 20 Jul '20

20 Jul '20

commit 040199319726d88a7730d7419e6fb26a7187ca5d Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 17 12:24:01 2020 -0400 Add git-resquash.sh to repository This differs from my old git-resquash.sh in that it uses the newer `git rebase --keep-base` if available --- scripts/git/git-install-tools.sh | 2 +- scripts/git/git-resquash.sh | 46 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/scripts/git/git-install-tools.sh b/scripts/git/git-install-tools.sh index 3b9c3d79f3..d74f8475af 100755 --- a/scripts/git/git-install-tools.sh +++ b/scripts/git/git-install-tools.sh @@ -3,7 +3,7 @@ SCRIPT_NAME=$(basename "$0") SCRIPTS_DIR=$(dirname "$0") -TOOL_NAMES=(push-all pull-all merge-forward list-tor-branches) +TOOL_NAMES=(push-all pull-all merge-forward list-tor-branches resquash) function usage() { diff --git a/scripts/git/git-resquash.sh b/scripts/git/git-resquash.sh new file mode 100755 index 0000000000..e0f26ecdc4 --- /dev/null +++ b/scripts/git/git-resquash.sh @@ -0,0 +1,46 @@ +#!/bin/sh +# +# Provides a convenient alias for "git rebase -i --autosquash --keep-root" +# on gits that have it, and a replacement on gits that don't. + +set -e + +PARENT="$1" + +if test "x$PARENT" = "x"; then + echo "You must specify the parent branch." + exit 1 +fi + +# Can we use git rebase --keep-base? Detect the git version to find out. +GITVER=$(git version) +if test "$(echo "$GITVER"|cut -d ' ' -f 1-2)" = "git version"; then + # --keep-base was added in git 2.24. Detect if we have that version. + GITVER=$(echo "$GITVER" | cut -d ' ' -f 3) + major=$(echo "$GITVER" | cut -d . -f 1) + minor=$(echo "$GITVER" | cut -d . -f 2) + if test "$major" -lt 2; then + USE_KEEP_BASE=0 + elif test "$major" -eq 2 && test "$minor" -lt 24; then + USE_KEEP_BASE=0 + else + USE_KEEP_BASE=1 + fi +else + # This isn't a git that reports its version in a way recognize; assume that + # --keep-base will work + USE_KEEP_BASE=1 +fi + +if test "x$USE_KEEP_BASE" = "x1" ; then + exec git rebase -i --autosquash --keep-base "${PARENT}" +else + REV=$(git log --reverse --format='%H' "${PARENT}..HEAD" | head -1) + + if test "x${REV}" = "x"; then + echo "No changes here since ${PARENT}" + exit 1 + fi + + exec git rebase -i --autosquash "${REV}^" +fi

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits July 2020