mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 23:07:18 +03:00
ba00990cdc
Summary: Created this diff by running: ``` find eden/scm/edenscm -name \*.py | xargs sed -i -e 's#update --clean#goto --clean#g' find eden/scm/tests -name \*.t | xargs sed -i -e 's#update --clean#goto --clean#g' find eden/scm/tests -name \*.t | xargs sed -i -e 's#update --continue#goto --continue#g' find eden/scm/edenscm -name \*.py | xargs sed -i -e 's#update --continue#goto --continue#g' find eden/scm/edenscm -name \*.py | xargs sed -i -e 's#prog@ update#prog@ goto#g' find eden/scm/tests -name \*.t | xargs sed -i -e 's# hg update # hg goto #g' find eden/scm/tests -name \*.t | xargs sed -i -e 's#hg update -C#hg goto -C#g' find eden/scm/tests -name \*.t | xargs sed -i -e 's# hg update$# hg goto#g' find eden/scm/tests -name \*.t | xargs sed -i -e 's# update HASH# goto HASH#g' find eden/scm/tests -name \*.t | xargs sed -i -e 's#hg update 1#hg goto 1#g' find eden/scm/tests -name \*.t | xargs sed -i -e "s#'hg update'#'hg goto'#g" find eden/scm/edenscm -name \*.py | xargs sed -i -e 's#:prog:`update`#:prog:`goto`#g' find eden/scm/edenscm -name \*.py | xargs sed -i -e 's#:prog:`update .::`#:prog:`goto .::`#g' sed -i -e 's#commit or update#commit or goto#' eden/integration/hg/update_test.py arc f ``` Though then I had to manually update `eden/integration/hg/update_test.py` to use `assertRegex()` instead of `assertEqual()`, but as noted, that is a temporary issue due to how we run that test for EdenFS for Windows internally. Fixes https://github.com/facebook/sapling/issues/149 Fixes https://github.com/facebook/sapling/issues/293 Reviewed By: zzl0, yancouto Differential Revision: D41859668 fbshipit-source-id: 3bdf4e342fc1a751335960a3216651a5ce35225f
267 lines
6.6 KiB
Perl
267 lines
6.6 KiB
Perl
#chg-compatible
|
|
#debugruntest-compatible
|
|
|
|
$ enable amend
|
|
$ setconfig diff.git=1
|
|
|
|
$ configure mutation-norecord
|
|
|
|
Basic amend
|
|
|
|
$ hg init repo1
|
|
$ cd repo1
|
|
$ hg debugdrawdag <<'EOS'
|
|
> B
|
|
> |
|
|
> A
|
|
> EOS
|
|
|
|
$ hg goto B -q
|
|
$ echo 2 >> B
|
|
|
|
$ hg amend
|
|
$ hg log -p -G --hidden -T '{node|short} {desc}\n'
|
|
@ be169c7e8dbe B
|
|
│ diff --git a/B b/B
|
|
│ new file mode 100644
|
|
│ --- /dev/null
|
|
│ +++ b/B
|
|
│ @@ -0,0 +1,1 @@
|
|
│ +B2
|
|
│
|
|
│ x 112478962961 B
|
|
├─╯ diff --git a/B b/B
|
|
│ new file mode 100644
|
|
│ --- /dev/null
|
|
│ +++ b/B
|
|
│ @@ -0,0 +1,1 @@
|
|
│ +B
|
|
│ \ No newline at end of file
|
|
│
|
|
o 426bada5c675 A
|
|
diff --git a/A b/A
|
|
new file mode 100644
|
|
--- /dev/null
|
|
+++ b/A
|
|
@@ -0,0 +1,1 @@
|
|
+A
|
|
\ No newline at end of file
|
|
|
|
Nothing changed
|
|
|
|
$ hg amend
|
|
nothing changed
|
|
[1]
|
|
|
|
$ hg amend -d "0 0"
|
|
nothing changed
|
|
[1]
|
|
|
|
$ hg amend -d "Thu Jan 01 00:00:00 1970 UTC"
|
|
nothing changed
|
|
[1]
|
|
|
|
Matcher and metadata options
|
|
|
|
$ echo 3 > C
|
|
$ echo 4 > D
|
|
$ hg add C D
|
|
$ hg amend -m NEWMESSAGE -I C
|
|
$ hg log -r . -T '{node|short} {desc} {files}\n'
|
|
c7ba14d9075b NEWMESSAGE B C
|
|
$ echo 5 > E
|
|
$ rm C
|
|
$ hg amend -d '2000 1000' -u 'Foo <foo@example.com>' -A C D
|
|
$ hg log -r . -T '{node|short} {desc} {files} {author} {date}\n'
|
|
14f6c4bcc865 NEWMESSAGE B D Foo <foo@example.com> 2000.01000
|
|
|
|
Amend with editor
|
|
|
|
$ cat > $TESTTMP/prefix.sh <<'EOF'
|
|
> printf 'EDITED: ' > $TESTTMP/msg
|
|
> cat "$1" >> $TESTTMP/msg
|
|
> mv $TESTTMP/msg "$1"
|
|
> EOF
|
|
$ chmod +x $TESTTMP/prefix.sh
|
|
|
|
$ HGEDITOR='sh "$TESTTMP/prefix.sh"' hg amend --edit
|
|
$ hg log -r . -T '{node|short} {desc}\n'
|
|
298f085230c3 EDITED: NEWMESSAGE
|
|
$ HGEDITOR='sh "$TESTTMP/prefix.sh"' hg amend -e -m MSG
|
|
$ hg log -r . -T '{node|short} {desc}\n'
|
|
974f07f28537 EDITED: MSG
|
|
|
|
$ echo FOO > $TESTTMP/msg
|
|
$ hg amend -l $TESTTMP/msg -m BAR
|
|
abort: options --message and --logfile are mutually exclusive
|
|
[255]
|
|
$ hg amend -l $TESTTMP/msg
|
|
$ hg log -r . -T '{node|short} {desc}\n'
|
|
507be9bdac71 FOO
|
|
|
|
Interactive mode
|
|
|
|
$ touch F G
|
|
$ hg add F G
|
|
$ cat <<EOS | hg amend -i --config ui.interactive=1
|
|
> y
|
|
> n
|
|
> EOS
|
|
diff --git a/F b/F
|
|
new file mode 100644
|
|
examine changes to 'F'? [Ynesfdaq?] y
|
|
|
|
diff --git a/G b/G
|
|
new file mode 100644
|
|
examine changes to 'G'? [Ynesfdaq?] n
|
|
|
|
$ hg log -r . -T '{files}\n'
|
|
B D F
|
|
|
|
Amend in the middle of a stack
|
|
|
|
$ hg init $TESTTMP/repo2
|
|
$ cd $TESTTMP/repo2
|
|
$ hg debugdrawdag <<'EOS'
|
|
> C
|
|
> |
|
|
> B
|
|
> |
|
|
> A
|
|
> EOS
|
|
|
|
$ hg goto -q B
|
|
$ echo 2 >> B
|
|
$ hg amend
|
|
hint[amend-restack]: descendants of 112478962961 are left behind - use 'hg restack' to rebase them
|
|
hint[hint-ack]: use 'hg hint --ack amend-restack' to silence these hints
|
|
|
|
$ hg log -T '{node|short} {desc}\n' -G
|
|
@ be169c7e8dbe B
|
|
│
|
|
│ o 26805aba1e60 C
|
|
│ │
|
|
│ x 112478962961 B
|
|
├─╯
|
|
o 426bada5c675 A
|
|
|
|
Cannot amend public changeset
|
|
|
|
$ hg debugmakepublic -r A
|
|
$ hg goto -C -q A
|
|
$ hg amend -m AMEND
|
|
abort: cannot amend public changesets
|
|
[255]
|
|
|
|
Amend a merge changeset
|
|
|
|
$ hg init $TESTTMP/repo3
|
|
$ cd $TESTTMP/repo3
|
|
$ hg debugdrawdag <<'EOS'
|
|
> C
|
|
> /|
|
|
> A B
|
|
> EOS
|
|
$ hg goto -q C
|
|
$ hg amend -m FOO
|
|
$ hg log -G -T '{desc}\n'
|
|
@ FOO
|
|
├─╮
|
|
│ o B
|
|
│
|
|
o A
|
|
|
|
|
|
More complete test for status changes (issue5732)
|
|
-------------------------------------------------
|
|
|
|
Generates history of files having 3 states, r0_r1_wc:
|
|
|
|
r0: ground (content/missing)
|
|
r1: old state to be amended (content/missing, where missing means removed)
|
|
wc: changes to be included in r1 (content/missing-tracked/untracked)
|
|
|
|
$ hg init $TESTTMP/wcstates
|
|
$ cd $TESTTMP/wcstates
|
|
|
|
$ $PYTHON $TESTDIR/generateworkingcopystates.py state 2 1
|
|
$ hg addremove -q --similarity 0
|
|
$ hg commit -m0
|
|
|
|
$ $PYTHON $TESTDIR/generateworkingcopystates.py state 2 2
|
|
$ hg addremove -q --similarity 0
|
|
$ hg commit -m1
|
|
|
|
$ $PYTHON $TESTDIR/generateworkingcopystates.py state 2 wc
|
|
$ hg addremove -q --similarity 0
|
|
$ hg forget *_*_*-untracked
|
|
$ rm *_*_missing-*
|
|
|
|
amend r1 to include wc changes
|
|
|
|
$ hg amend
|
|
|
|
clean/modified/removed/added states of the amended revision
|
|
|
|
$ hg status --all --change . 'glob:content1_*_content1-tracked'
|
|
C content1_content1_content1-tracked
|
|
C content1_content2_content1-tracked
|
|
C content1_missing_content1-tracked
|
|
$ hg status --all --change . 'glob:content1_*_content[23]-tracked'
|
|
M content1_content1_content3-tracked
|
|
M content1_content2_content2-tracked
|
|
M content1_content2_content3-tracked
|
|
M content1_missing_content3-tracked
|
|
$ hg status --all --change . 'glob:content1_*_missing-tracked'
|
|
M content1_content2_missing-tracked
|
|
R content1_missing_missing-tracked
|
|
C content1_content1_missing-tracked
|
|
$ hg status --all --change . 'glob:content1_*_*-untracked'
|
|
R content1_content1_content1-untracked
|
|
R content1_content1_content3-untracked
|
|
R content1_content1_missing-untracked
|
|
R content1_content2_content1-untracked
|
|
R content1_content2_content2-untracked
|
|
R content1_content2_content3-untracked
|
|
R content1_content2_missing-untracked
|
|
R content1_missing_content1-untracked
|
|
R content1_missing_content3-untracked
|
|
R content1_missing_missing-untracked
|
|
$ hg status --all --change . 'glob:missing_content2_*'
|
|
A missing_content2_content2-tracked
|
|
A missing_content2_content3-tracked
|
|
A missing_content2_missing-tracked
|
|
$ hg status --all --change . 'glob:missing_missing_*'
|
|
A missing_missing_content3-tracked
|
|
|
|
working directory should be all clean (with some missing/untracked files)
|
|
|
|
$ hg status --all 'glob:*_content?-tracked'
|
|
C content1_content1_content1-tracked
|
|
C content1_content1_content3-tracked
|
|
C content1_content2_content1-tracked
|
|
C content1_content2_content2-tracked
|
|
C content1_content2_content3-tracked
|
|
C content1_missing_content1-tracked
|
|
C content1_missing_content3-tracked
|
|
C missing_content2_content2-tracked
|
|
C missing_content2_content3-tracked
|
|
C missing_missing_content3-tracked
|
|
$ hg status --all 'glob:*_missing-tracked'
|
|
! content1_content1_missing-tracked
|
|
! content1_content2_missing-tracked
|
|
! content1_missing_missing-tracked
|
|
! missing_content2_missing-tracked
|
|
! missing_missing_missing-tracked
|
|
$ hg status --all 'glob:*-untracked'
|
|
? content1_content1_content1-untracked
|
|
? content1_content1_content3-untracked
|
|
? content1_content2_content1-untracked
|
|
? content1_content2_content2-untracked
|
|
? content1_content2_content3-untracked
|
|
? content1_missing_content1-untracked
|
|
? content1_missing_content3-untracked
|
|
? missing_content2_content2-untracked
|
|
? missing_content2_content3-untracked
|
|
? missing_missing_content3-untracked
|