2016-08-25 19:42:23 +03:00
|
|
|
$ PYTHONPATH=$TESTDIR/../:$PYTHONPATH
|
|
|
|
$ export PYTHONPATH
|
|
|
|
|
2016-08-23 17:19:29 +03:00
|
|
|
$ extpath=`dirname $TESTDIR`
|
|
|
|
$ cat >> $HGRCPATH << EOF
|
|
|
|
> [extensions]
|
2016-08-24 18:28:47 +03:00
|
|
|
> absorb=$extpath/hgext3rd/absorb.py
|
2016-08-23 17:19:29 +03:00
|
|
|
> EOF
|
|
|
|
|
|
|
|
$ sedi() { # workaround check-code
|
|
|
|
> pattern="$1"
|
|
|
|
> shift
|
|
|
|
> for i in "$@"; do
|
|
|
|
> sed "$pattern" "$i" > "$i".tmp
|
|
|
|
> mv "$i".tmp "$i"
|
|
|
|
> done
|
|
|
|
> }
|
|
|
|
|
|
|
|
$ hg init repo1
|
|
|
|
$ cd repo1
|
|
|
|
|
|
|
|
Do not crash with empty repo:
|
|
|
|
|
2016-08-24 18:28:47 +03:00
|
|
|
$ hg absorb
|
2016-09-12 19:00:54 +03:00
|
|
|
abort: no changeset to change
|
2016-08-23 17:19:29 +03:00
|
|
|
[255]
|
|
|
|
|
|
|
|
Make some commits:
|
|
|
|
|
|
|
|
$ for i in 1 2 3 4 5; do
|
|
|
|
> echo $i >> a
|
|
|
|
> hg commit -A a -m "commit $i" -q
|
|
|
|
> done
|
|
|
|
|
|
|
|
$ hg annotate a
|
|
|
|
0: 1
|
|
|
|
1: 2
|
|
|
|
2: 3
|
|
|
|
3: 4
|
|
|
|
4: 5
|
|
|
|
|
|
|
|
Change a few lines:
|
|
|
|
|
|
|
|
$ cat > a <<EOF
|
|
|
|
> 1a
|
|
|
|
> 2b
|
|
|
|
> 3
|
|
|
|
> 4d
|
|
|
|
> 5e
|
|
|
|
> EOF
|
2016-08-23 17:19:54 +03:00
|
|
|
|
2016-08-24 18:28:47 +03:00
|
|
|
Preview absorb changes:
|
2016-08-23 17:19:54 +03:00
|
|
|
|
2016-08-24 18:28:47 +03:00
|
|
|
$ hg absorb --print-changes --dry-run
|
2016-08-23 17:19:54 +03:00
|
|
|
showing changes for a
|
|
|
|
@@ -0,2 +0,2 @@
|
|
|
|
4ec16f8 -1
|
|
|
|
5c5f952 -2
|
|
|
|
4ec16f8 +1a
|
|
|
|
5c5f952 +2b
|
|
|
|
@@ -3,2 +3,2 @@
|
|
|
|
ad8b8b7 -4
|
|
|
|
4f55fa6 -5
|
|
|
|
ad8b8b7 +4d
|
|
|
|
4f55fa6 +5e
|
|
|
|
|
2016-08-24 18:28:47 +03:00
|
|
|
Run absorb:
|
2016-08-23 17:19:54 +03:00
|
|
|
|
2016-08-24 18:28:47 +03:00
|
|
|
$ hg absorb
|
2016-08-23 17:19:29 +03:00
|
|
|
saved backup bundle to * (glob)
|
|
|
|
2 of 2 chunks(s) applied
|
|
|
|
$ hg annotate a
|
|
|
|
0: 1a
|
|
|
|
1: 2b
|
|
|
|
2: 3
|
|
|
|
3: 4d
|
|
|
|
4: 5e
|
|
|
|
|
|
|
|
Delete a few lines and related commits will be removed if they will be empty:
|
|
|
|
|
|
|
|
$ cat > a <<EOF
|
|
|
|
> 2b
|
|
|
|
> 4d
|
|
|
|
> EOF
|
2016-08-24 18:28:47 +03:00
|
|
|
$ hg absorb
|
2016-08-23 17:19:29 +03:00
|
|
|
saved backup bundle to * (glob)
|
|
|
|
3 of 3 chunks(s) applied
|
|
|
|
$ hg annotate a
|
|
|
|
1: 2b
|
|
|
|
2: 4d
|
|
|
|
$ hg log -T '{rev} {desc}\n' -Gp
|
|
|
|
@ 2 commit 4
|
|
|
|
| diff -r 1cae118c7ed8 -r 58a62bade1c6 a
|
|
|
|
| --- a/a Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
| +++ b/a Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
| @@ -1,1 +1,2 @@
|
|
|
|
| 2b
|
|
|
|
| +4d
|
|
|
|
|
|
|
|
|
o 1 commit 2
|
|
|
|
| diff -r 84add69aeac0 -r 1cae118c7ed8 a
|
|
|
|
| --- a/a Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
| +++ b/a Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
| @@ -0,0 +1,1 @@
|
|
|
|
| +2b
|
|
|
|
|
|
|
|
|
o 0 commit 1
|
|
|
|
|
|
|
|
|
|
|
|
Non 1:1 map changes will be ignored:
|
|
|
|
|
|
|
|
$ echo 1 > a
|
2016-08-24 18:28:47 +03:00
|
|
|
$ hg absorb
|
2016-08-23 17:19:29 +03:00
|
|
|
nothing applied
|
|
|
|
[1]
|
|
|
|
|
|
|
|
Insertaions:
|
|
|
|
|
|
|
|
$ cat > a << EOF
|
|
|
|
> insert before 2b
|
|
|
|
> 2b
|
|
|
|
> 4d
|
|
|
|
> insert aftert 4d
|
|
|
|
> EOF
|
2016-08-24 18:28:47 +03:00
|
|
|
$ hg absorb -q
|
2016-08-23 17:19:29 +03:00
|
|
|
$ hg status
|
|
|
|
$ hg annotate a
|
|
|
|
1: insert before 2b
|
|
|
|
1: 2b
|
|
|
|
2: 4d
|
|
|
|
2: insert aftert 4d
|
|
|
|
|
|
|
|
Bookmarks are moved:
|
|
|
|
|
|
|
|
$ hg bookmark -r 1 b1
|
|
|
|
$ hg bookmark -r 2 b2
|
|
|
|
$ hg bookmark ba
|
|
|
|
$ hg bookmarks
|
|
|
|
b1 1:b35060a57a50
|
|
|
|
b2 2:946e4bc87915
|
|
|
|
* ba 2:946e4bc87915
|
|
|
|
$ sedi 's/insert/INSERT/' a
|
2016-08-24 18:28:47 +03:00
|
|
|
$ hg absorb -q
|
2016-08-23 17:19:29 +03:00
|
|
|
$ hg status
|
|
|
|
$ hg bookmarks
|
|
|
|
b1 1:a4183e9b3d31
|
|
|
|
b2 2:c9b20c925790
|
|
|
|
* ba 2:c9b20c925790
|
|
|
|
|
|
|
|
Non-mofified files are ignored:
|
|
|
|
|
|
|
|
$ touch b
|
|
|
|
$ hg commit -A b -m b
|
|
|
|
$ touch c
|
|
|
|
$ hg add c
|
|
|
|
$ hg rm b
|
2016-08-24 18:28:47 +03:00
|
|
|
$ hg absorb
|
2016-08-23 17:19:29 +03:00
|
|
|
nothing applied
|
|
|
|
[1]
|
|
|
|
$ sedi 's/INSERT/Insert/' a
|
2016-08-24 18:28:47 +03:00
|
|
|
$ hg absorb
|
2016-08-23 17:19:29 +03:00
|
|
|
saved backup bundle to * (glob)
|
|
|
|
2 of 2 chunks(s) applied
|
|
|
|
$ hg status
|
|
|
|
A c
|
|
|
|
R b
|
|
|
|
|
|
|
|
Public commits will not be changed:
|
|
|
|
|
|
|
|
$ hg phase -p 1
|
|
|
|
$ sedi 's/Insert/insert/' a
|
2016-08-24 18:28:47 +03:00
|
|
|
$ hg absorb -pn
|
2016-08-23 17:19:54 +03:00
|
|
|
showing changes for a
|
|
|
|
@@ -0,1 +0,1 @@
|
|
|
|
-Insert before 2b
|
|
|
|
+insert before 2b
|
|
|
|
@@ -3,1 +3,1 @@
|
|
|
|
85b4e0e -Insert aftert 4d
|
|
|
|
85b4e0e +insert aftert 4d
|
2016-08-24 18:28:47 +03:00
|
|
|
$ hg absorb
|
2016-08-23 17:19:29 +03:00
|
|
|
saved backup bundle to * (glob)
|
|
|
|
1 of 2 chunks(s) applied
|
|
|
|
$ hg diff -U 0
|
|
|
|
diff -r 1c8eadede62a a
|
|
|
|
--- a/a Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
+++ b/a * (glob)
|
|
|
|
@@ -1,1 +1,1 @@
|
|
|
|
-Insert before 2b
|
|
|
|
+insert before 2b
|
|
|
|
$ hg annotate a
|
|
|
|
1: Insert before 2b
|
|
|
|
1: 2b
|
|
|
|
2: 4d
|
|
|
|
2: insert aftert 4d
|
|
|
|
|
|
|
|
Make working copy clean:
|
|
|
|
|
|
|
|
$ hg revert -q -C a b
|
|
|
|
$ hg forget c
|
|
|
|
$ rm c
|
|
|
|
$ hg status
|
|
|
|
|
|
|
|
Merge commit will not be changed:
|
|
|
|
|
|
|
|
$ echo 1 > m1
|
|
|
|
$ hg commit -A m1 -m m1
|
|
|
|
$ hg bookmark -q -i m1
|
|
|
|
$ hg update -q '.^'
|
|
|
|
$ echo 2 > m2
|
|
|
|
$ hg commit -q -A m2 -m m2
|
|
|
|
$ hg merge -q m1
|
|
|
|
$ hg commit -m merge
|
|
|
|
$ hg bookmark -d m1
|
|
|
|
$ hg log -G -T '{rev} {desc} {phase}\n'
|
|
|
|
@ 6 merge draft
|
|
|
|
|\
|
|
|
|
| o 5 m2 draft
|
|
|
|
| |
|
|
|
|
o | 4 m1 draft
|
|
|
|
|/
|
|
|
|
o 3 b draft
|
|
|
|
|
|
|
|
|
o 2 commit 4 draft
|
|
|
|
|
|
|
|
|
o 1 commit 2 public
|
|
|
|
|
|
|
|
|
o 0 commit 1 public
|
|
|
|
|
|
|
|
$ echo 2 >> m1
|
|
|
|
$ echo 2 >> m2
|
2016-08-24 18:28:47 +03:00
|
|
|
$ hg absorb
|
2016-09-12 19:00:54 +03:00
|
|
|
abort: no changeset to change
|
2016-08-23 17:19:29 +03:00
|
|
|
[255]
|
|
|
|
$ hg revert -q -C m1 m2
|
|
|
|
|
|
|
|
Use a new repo:
|
|
|
|
|
|
|
|
$ cd ..
|
|
|
|
$ hg init repo2
|
|
|
|
$ cd repo2
|
|
|
|
|
|
|
|
Make some commits to multiple files:
|
|
|
|
|
|
|
|
$ for f in a b; do
|
|
|
|
> for i in 1 2; do
|
|
|
|
> echo $f line $i >> $f
|
|
|
|
> hg commit -A $f -m "commit $f $i" -q
|
|
|
|
> done
|
|
|
|
> done
|
|
|
|
|
|
|
|
Use pattern to select files to be fixed up:
|
|
|
|
|
|
|
|
$ sedi 's/line/Line/' a b
|
|
|
|
$ hg status
|
|
|
|
M a
|
|
|
|
M b
|
2016-08-24 18:28:47 +03:00
|
|
|
$ hg absorb a
|
2016-08-23 17:19:29 +03:00
|
|
|
saved backup bundle to * (glob)
|
|
|
|
1 of 1 chunks(s) applied
|
|
|
|
$ hg status
|
|
|
|
M b
|
2016-08-24 18:28:47 +03:00
|
|
|
$ hg absorb --exclude b
|
2016-08-23 17:19:29 +03:00
|
|
|
nothing applied
|
|
|
|
[1]
|
2016-08-24 18:28:47 +03:00
|
|
|
$ hg absorb b
|
2016-08-23 17:19:29 +03:00
|
|
|
saved backup bundle to * (glob)
|
|
|
|
1 of 1 chunks(s) applied
|
|
|
|
$ hg status
|
|
|
|
$ cat a b
|
|
|
|
a Line 1
|
|
|
|
a Line 2
|
|
|
|
b Line 1
|
|
|
|
b Line 2
|
|
|
|
|
2016-08-24 18:28:47 +03:00
|
|
|
Test config option absorb.maxstacksize:
|
2016-08-23 17:19:29 +03:00
|
|
|
|
|
|
|
$ sedi 's/Line/line/' a b
|
|
|
|
$ hg log -T '{rev}:{node} {desc}\n'
|
|
|
|
3:712d16a8f445834e36145408eabc1d29df05ec09 commit b 2
|
|
|
|
2:74cfa6294160149d60adbf7582b99ce37a4597ec commit b 1
|
|
|
|
1:28f10dcf96158f84985358a2e5d5b3505ca69c22 commit a 2
|
|
|
|
0:f9a81da8dc53380ed91902e5b82c1b36255a4bd0 commit a 1
|
2016-08-24 18:28:47 +03:00
|
|
|
$ hg --config absorb.maxstacksize=1 absorb -pn
|
|
|
|
absorb: only the recent 1 changesets will be analysed
|
2016-08-23 17:19:29 +03:00
|
|
|
showing changes for a
|
|
|
|
@@ -0,2 +0,2 @@
|
|
|
|
-a Line 1
|
|
|
|
-a Line 2
|
|
|
|
+a line 1
|
|
|
|
+a line 2
|
|
|
|
showing changes for b
|
|
|
|
@@ -0,2 +0,2 @@
|
|
|
|
-b Line 1
|
|
|
|
712d16a -b Line 2
|
|
|
|
+b line 1
|
|
|
|
712d16a +b line 2
|
|
|
|
|
|
|
|
Test obsolete markers creation:
|
|
|
|
|
|
|
|
$ cat >> $HGRCPATH << EOF
|
|
|
|
> [experimental]
|
|
|
|
> evolution=createmarkers
|
2016-08-24 18:28:47 +03:00
|
|
|
> [absorb]
|
2016-08-23 17:19:29 +03:00
|
|
|
> addnoise=1
|
|
|
|
> EOF
|
|
|
|
|
2016-08-24 18:28:47 +03:00
|
|
|
$ hg --config absorb.maxstacksize=3 sf
|
|
|
|
absorb: only the recent 3 changesets will be analysed
|
2016-08-23 17:19:29 +03:00
|
|
|
2 of 2 chunks(s) applied
|
2016-08-24 18:28:47 +03:00
|
|
|
$ hg log -T '{rev}:{node|short} {desc} {get(extras, "absorb_source")}\n'
|
|
|
|
6:3dfde4199b46 commit b 2 712d16a8f445834e36145408eabc1d29df05ec09
|
|
|
|
5:99cfab7da5ff commit b 1 74cfa6294160149d60adbf7582b99ce37a4597ec
|
|
|
|
4:fec2b3bd9e08 commit a 2 28f10dcf96158f84985358a2e5d5b3505ca69c22
|
2016-08-23 17:19:29 +03:00
|
|
|
0:f9a81da8dc53 commit a 1
|
2016-08-24 18:28:47 +03:00
|
|
|
$ hg absorb
|
2016-08-23 17:19:29 +03:00
|
|
|
1 of 1 chunks(s) applied
|
2016-08-24 18:28:47 +03:00
|
|
|
$ hg log -T '{rev}:{node|short} {desc} {get(extras, "absorb_source")}\n'
|
|
|
|
10:e1c8c1e030a4 commit b 2 3dfde4199b4610ea6e3c6fa9f5bdad8939d69524
|
|
|
|
9:816c30955758 commit b 1 99cfab7da5ffdaf3b9fc6643b14333e194d87f46
|
|
|
|
8:5867d584106b commit a 2 fec2b3bd9e0834b7cb6a564348a0058171aed811
|
|
|
|
7:8c76602baf10 commit a 1 f9a81da8dc53380ed91902e5b82c1b36255a4bd0
|
smartfixup: add a config option to make it a subcommand of "amend"
Summary:
Some people think this command should be a part of "amend". If you check the
meaning of the "amend" English word, that makes sense. But if you look at
the actual "amend" command, there are significant differences:
1. smartfixup rewrites a stack of changesets, and can even delete
changesets, where amend only rewrites the working directory parent.
2. smartfixup is best-effort, i.e. does not guarantee that 100% of
user-requested modifications will be included, where amend will just take
100% (with "-i", it's 100% chunks selected by the user).
3. a lot of "amend" flags do not make much sense to smartfixup, like message
editing (designed to edit a single changeset), "--addremove", "--secret",
etc.
4. literally, smartfixup shares little code with the existing "amend" logic.
"amend" is part of "fbamend" or "evolve". this extension should not
depend on any of them.
So it's cleaner to be a separate command, not a part of `amend`.
However, I think it makes sense to have an option to satisfy those who want
to use "amend". So they can use "amend --related", "amend --fixups",
"amend --stack", "amend --auto" or whatever they choose. This diff adds such
a config option. We may also ship such a config option to make the command
easier for discovery.
Note the "amend" version is slightly different from the original smartfixup
command. The former targets basic users who expect amend to take all of
their changes, while the latter targets power users understanding what's
going on.
Therefore, the "amend" version will print extra information about what
changes are ignored, for example:
```
# changes not applied and left in working directory:
# M a : 1 modified chunks were ignored
# M c : unsupported file type (ex. binary or link)
# R b : removed files were ignored
```
To support the above change, `fixupstate.status` was added to avoid a second
"status" run and handles the "status" with interactive mode correctly. An
issue about symbolic links being added to `fixupstate.paths` was fixed by
the way.
Test Plan: Run the newly changed test.
Reviewers: #sourcecontrol, ttung, rmcelroy
Reviewed By: rmcelroy
Subscribers: rmcelroy, mjpieters
Differential Revision: https://phabricator.intern.facebook.com/D3760498
Signature: t1:3760498:1472052376:7ddbfe763c7327d044b0d471c31a58fcb1e21dac
2016-08-24 18:28:15 +03:00
|
|
|
|
2016-08-24 18:28:47 +03:00
|
|
|
Test config option absorb.amendflags and running as a sub command of amend:
|
smartfixup: add a config option to make it a subcommand of "amend"
Summary:
Some people think this command should be a part of "amend". If you check the
meaning of the "amend" English word, that makes sense. But if you look at
the actual "amend" command, there are significant differences:
1. smartfixup rewrites a stack of changesets, and can even delete
changesets, where amend only rewrites the working directory parent.
2. smartfixup is best-effort, i.e. does not guarantee that 100% of
user-requested modifications will be included, where amend will just take
100% (with "-i", it's 100% chunks selected by the user).
3. a lot of "amend" flags do not make much sense to smartfixup, like message
editing (designed to edit a single changeset), "--addremove", "--secret",
etc.
4. literally, smartfixup shares little code with the existing "amend" logic.
"amend" is part of "fbamend" or "evolve". this extension should not
depend on any of them.
So it's cleaner to be a separate command, not a part of `amend`.
However, I think it makes sense to have an option to satisfy those who want
to use "amend". So they can use "amend --related", "amend --fixups",
"amend --stack", "amend --auto" or whatever they choose. This diff adds such
a config option. We may also ship such a config option to make the command
easier for discovery.
Note the "amend" version is slightly different from the original smartfixup
command. The former targets basic users who expect amend to take all of
their changes, while the latter targets power users understanding what's
going on.
Therefore, the "amend" version will print extra information about what
changes are ignored, for example:
```
# changes not applied and left in working directory:
# M a : 1 modified chunks were ignored
# M c : unsupported file type (ex. binary or link)
# R b : removed files were ignored
```
To support the above change, `fixupstate.status` was added to avoid a second
"status" run and handles the "status" with interactive mode correctly. An
issue about symbolic links being added to `fixupstate.paths` was fixed by
the way.
Test Plan: Run the newly changed test.
Reviewers: #sourcecontrol, ttung, rmcelroy
Reviewed By: rmcelroy
Subscribers: rmcelroy, mjpieters
Differential Revision: https://phabricator.intern.facebook.com/D3760498
Signature: t1:3760498:1472052376:7ddbfe763c7327d044b0d471c31a58fcb1e21dac
2016-08-24 18:28:15 +03:00
|
|
|
|
|
|
|
$ cat >> $TESTTMP/dummyamend.py << EOF
|
|
|
|
> from mercurial import cmdutil, commands
|
|
|
|
> cmdtable = {}
|
|
|
|
> command = cmdutil.command(cmdtable)
|
|
|
|
> @command('amend', [], '')
|
|
|
|
> def amend(ui, repo, *pats, **opts):
|
|
|
|
> return 3
|
|
|
|
> EOF
|
|
|
|
$ cat >> $HGRCPATH << EOF
|
|
|
|
> [extensions]
|
|
|
|
> fbamend=$TESTTMP/dummyamend.py
|
2016-08-24 18:28:47 +03:00
|
|
|
> [absorb]
|
smartfixup: add a config option to make it a subcommand of "amend"
Summary:
Some people think this command should be a part of "amend". If you check the
meaning of the "amend" English word, that makes sense. But if you look at
the actual "amend" command, there are significant differences:
1. smartfixup rewrites a stack of changesets, and can even delete
changesets, where amend only rewrites the working directory parent.
2. smartfixup is best-effort, i.e. does not guarantee that 100% of
user-requested modifications will be included, where amend will just take
100% (with "-i", it's 100% chunks selected by the user).
3. a lot of "amend" flags do not make much sense to smartfixup, like message
editing (designed to edit a single changeset), "--addremove", "--secret",
etc.
4. literally, smartfixup shares little code with the existing "amend" logic.
"amend" is part of "fbamend" or "evolve". this extension should not
depend on any of them.
So it's cleaner to be a separate command, not a part of `amend`.
However, I think it makes sense to have an option to satisfy those who want
to use "amend". So they can use "amend --related", "amend --fixups",
"amend --stack", "amend --auto" or whatever they choose. This diff adds such
a config option. We may also ship such a config option to make the command
easier for discovery.
Note the "amend" version is slightly different from the original smartfixup
command. The former targets basic users who expect amend to take all of
their changes, while the latter targets power users understanding what's
going on.
Therefore, the "amend" version will print extra information about what
changes are ignored, for example:
```
# changes not applied and left in working directory:
# M a : 1 modified chunks were ignored
# M c : unsupported file type (ex. binary or link)
# R b : removed files were ignored
```
To support the above change, `fixupstate.status` was added to avoid a second
"status" run and handles the "status" with interactive mode correctly. An
issue about symbolic links being added to `fixupstate.paths` was fixed by
the way.
Test Plan: Run the newly changed test.
Reviewers: #sourcecontrol, ttung, rmcelroy
Reviewed By: rmcelroy
Subscribers: rmcelroy, mjpieters
Differential Revision: https://phabricator.intern.facebook.com/D3760498
Signature: t1:3760498:1472052376:7ddbfe763c7327d044b0d471c31a58fcb1e21dac
2016-08-24 18:28:15 +03:00
|
|
|
> amendflag = correlated
|
|
|
|
> EOF
|
|
|
|
|
|
|
|
$ hg amend -h
|
|
|
|
hg amend
|
|
|
|
|
|
|
|
(no help text available)
|
|
|
|
|
|
|
|
options:
|
|
|
|
|
2016-10-21 18:58:52 +03:00
|
|
|
--correlated incorporate corrections into stack. see 'hg help absorb' for
|
|
|
|
details
|
smartfixup: add a config option to make it a subcommand of "amend"
Summary:
Some people think this command should be a part of "amend". If you check the
meaning of the "amend" English word, that makes sense. But if you look at
the actual "amend" command, there are significant differences:
1. smartfixup rewrites a stack of changesets, and can even delete
changesets, where amend only rewrites the working directory parent.
2. smartfixup is best-effort, i.e. does not guarantee that 100% of
user-requested modifications will be included, where amend will just take
100% (with "-i", it's 100% chunks selected by the user).
3. a lot of "amend" flags do not make much sense to smartfixup, like message
editing (designed to edit a single changeset), "--addremove", "--secret",
etc.
4. literally, smartfixup shares little code with the existing "amend" logic.
"amend" is part of "fbamend" or "evolve". this extension should not
depend on any of them.
So it's cleaner to be a separate command, not a part of `amend`.
However, I think it makes sense to have an option to satisfy those who want
to use "amend". So they can use "amend --related", "amend --fixups",
"amend --stack", "amend --auto" or whatever they choose. This diff adds such
a config option. We may also ship such a config option to make the command
easier for discovery.
Note the "amend" version is slightly different from the original smartfixup
command. The former targets basic users who expect amend to take all of
their changes, while the latter targets power users understanding what's
going on.
Therefore, the "amend" version will print extra information about what
changes are ignored, for example:
```
# changes not applied and left in working directory:
# M a : 1 modified chunks were ignored
# M c : unsupported file type (ex. binary or link)
# R b : removed files were ignored
```
To support the above change, `fixupstate.status` was added to avoid a second
"status" run and handles the "status" with interactive mode correctly. An
issue about symbolic links being added to `fixupstate.paths` was fixed by
the way.
Test Plan: Run the newly changed test.
Reviewers: #sourcecontrol, ttung, rmcelroy
Reviewed By: rmcelroy
Subscribers: rmcelroy, mjpieters
Differential Revision: https://phabricator.intern.facebook.com/D3760498
Signature: t1:3760498:1472052376:7ddbfe763c7327d044b0d471c31a58fcb1e21dac
2016-08-24 18:28:15 +03:00
|
|
|
|
|
|
|
(some details hidden, use --verbose to show complete help)
|
|
|
|
|
|
|
|
$ $PYTHON -c 'print("".join(map(chr, range(0,3))))' > c
|
|
|
|
$ hg commit -A c -m 'c is a binary file'
|
|
|
|
$ echo c >> c
|
2016-10-17 19:01:02 +03:00
|
|
|
$ sedi $'2i\\\nINS\n' b
|
smartfixup: add a config option to make it a subcommand of "amend"
Summary:
Some people think this command should be a part of "amend". If you check the
meaning of the "amend" English word, that makes sense. But if you look at
the actual "amend" command, there are significant differences:
1. smartfixup rewrites a stack of changesets, and can even delete
changesets, where amend only rewrites the working directory parent.
2. smartfixup is best-effort, i.e. does not guarantee that 100% of
user-requested modifications will be included, where amend will just take
100% (with "-i", it's 100% chunks selected by the user).
3. a lot of "amend" flags do not make much sense to smartfixup, like message
editing (designed to edit a single changeset), "--addremove", "--secret",
etc.
4. literally, smartfixup shares little code with the existing "amend" logic.
"amend" is part of "fbamend" or "evolve". this extension should not
depend on any of them.
So it's cleaner to be a separate command, not a part of `amend`.
However, I think it makes sense to have an option to satisfy those who want
to use "amend". So they can use "amend --related", "amend --fixups",
"amend --stack", "amend --auto" or whatever they choose. This diff adds such
a config option. We may also ship such a config option to make the command
easier for discovery.
Note the "amend" version is slightly different from the original smartfixup
command. The former targets basic users who expect amend to take all of
their changes, while the latter targets power users understanding what's
going on.
Therefore, the "amend" version will print extra information about what
changes are ignored, for example:
```
# changes not applied and left in working directory:
# M a : 1 modified chunks were ignored
# M c : unsupported file type (ex. binary or link)
# R b : removed files were ignored
```
To support the above change, `fixupstate.status` was added to avoid a second
"status" run and handles the "status" with interactive mode correctly. An
issue about symbolic links being added to `fixupstate.paths` was fixed by
the way.
Test Plan: Run the newly changed test.
Reviewers: #sourcecontrol, ttung, rmcelroy
Reviewed By: rmcelroy
Subscribers: rmcelroy, mjpieters
Differential Revision: https://phabricator.intern.facebook.com/D3760498
Signature: t1:3760498:1472052376:7ddbfe763c7327d044b0d471c31a58fcb1e21dac
2016-08-24 18:28:15 +03:00
|
|
|
$ echo END >> b
|
|
|
|
$ hg rm a
|
|
|
|
$ hg amend --correlated
|
|
|
|
1 of 2 chunks(s) applied
|
|
|
|
|
|
|
|
# changes not applied and left in working directory:
|
|
|
|
# M b : 1 modified chunks were ignored
|
|
|
|
# M c : unsupported file type (ex. binary or link)
|
|
|
|
# R a : removed files were ignored
|
|
|
|
|
2016-09-01 23:05:52 +03:00
|
|
|
Executable files:
|
|
|
|
|
|
|
|
$ cat >> $HGRCPATH << EOF
|
|
|
|
> [diff]
|
|
|
|
> git=True
|
|
|
|
> EOF
|
|
|
|
$ cd ..
|
|
|
|
$ hg init repo3
|
|
|
|
$ cd repo3
|
|
|
|
$ echo > foo.py
|
|
|
|
$ chmod +x foo.py
|
|
|
|
$ hg add foo.py
|
|
|
|
$ hg commit -mfoo
|
|
|
|
|
|
|
|
$ echo bla > foo.py
|
|
|
|
$ hg absorb --dry-run --print-changes
|
|
|
|
showing changes for foo.py
|
|
|
|
@@ -0,1 +0,1 @@
|
|
|
|
99b4ae7 -
|
|
|
|
99b4ae7 +bla
|
|
|
|
$ hg absorb
|
|
|
|
1 of 1 chunks(s) applied
|
|
|
|
$ hg diff -c .
|
|
|
|
diff --git a/foo.py b/foo.py
|
|
|
|
new file mode 100755
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/foo.py
|
|
|
|
@@ -0,0 +1,1 @@
|
|
|
|
+bla
|
|
|
|
$ hg diff
|