mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 08:47:12 +03:00
98d9269874
Summary: Create a fork of the Mercurial code that we can use to build server rpms. The hg servers will continue to exist for a few more months while we move the darkstorm and ediscovery use cases off them. In the mean time, we want to start making breaking changes to the client, so let's create a stable copy of the hg code to produce rpms for the hg servers. The fork is based off c7770c78d, the latest hg release. This copies the files as is, then adds some minor tweaks to get it to build: - Disables some lint checks that appear to be bypassed by path - sed replace eden/scm with eden/hg-server - Removed a dependency on scm/telemetry from the edenfs-client tests since scm/telemetry pulls in the original eden/scm/lib/configparser which conflicts with the hg-server conflict parser. allow-large-files Reviewed By: quark-zju Differential Revision: D27632557 fbshipit-source-id: b2f442f4ec000ea08e4d62de068750832198e1f4
443 lines
8.9 KiB
Perl
443 lines
8.9 KiB
Perl
#chg-compatible
|
|
|
|
$ enable rebase remotenames
|
|
|
|
$ hg init a
|
|
$ cd a
|
|
|
|
$ echo A > A
|
|
$ hg ci -Am A
|
|
adding A
|
|
|
|
$ echo B > B
|
|
$ hg ci -Am B
|
|
adding B
|
|
|
|
$ echo C >> A
|
|
$ hg ci -m C
|
|
|
|
$ hg up -q -C 'desc(A)'
|
|
|
|
$ echo D >> A
|
|
$ hg ci -m D
|
|
|
|
$ echo E > E
|
|
$ hg ci -Am E
|
|
adding E
|
|
|
|
$ cd ..
|
|
|
|
|
|
Changes during an interruption - continue:
|
|
|
|
$ hg clone -q -u . a a1
|
|
$ cd a1
|
|
|
|
$ tglog
|
|
@ ae36e8e3dfd7 'E'
|
|
│
|
|
o 46b37eabc604 'D'
|
|
│
|
|
│ o 965c486023db 'C'
|
|
│ │
|
|
│ o 27547f69f254 'B'
|
|
├─╯
|
|
o 4a2df7238c3b 'A'
|
|
|
|
Rebasing B onto E:
|
|
|
|
$ hg rebase -s 'desc(B)' -d 'desc(E)'
|
|
rebasing 27547f69f254 "B"
|
|
rebasing 965c486023db "C"
|
|
merging A
|
|
warning: 1 conflicts while merging A! (edit, then use 'hg resolve --mark')
|
|
unresolved conflicts (see hg resolve, then hg rebase --continue)
|
|
[1]
|
|
|
|
Force a commit on C during the interruption:
|
|
|
|
$ hg up -q -C 'desc(C)' --config 'extensions.rebase=!'
|
|
|
|
$ echo 'Extra' > Extra
|
|
$ hg add Extra
|
|
$ hg ci -m 'Extra' --config 'extensions.rebase=!'
|
|
|
|
$ tglogp
|
|
@ deb5d2f93d8b draft 'Extra'
|
|
│
|
|
│ o 45396c49d53b draft 'B'
|
|
│ │
|
|
│ o ae36e8e3dfd7 draft 'E'
|
|
│ │
|
|
│ o 46b37eabc604 draft 'D'
|
|
│ │
|
|
o │ 965c486023db draft 'C'
|
|
│ │
|
|
x │ 27547f69f254 draft 'B'
|
|
├─╯
|
|
o 4a2df7238c3b draft 'A'
|
|
|
|
Resume the rebasing:
|
|
|
|
$ hg rebase --continue
|
|
already rebased 27547f69f254 "B" as 45396c49d53b
|
|
rebasing 965c486023db "C"
|
|
merging A
|
|
warning: 1 conflicts while merging A! (edit, then use 'hg resolve --mark')
|
|
unresolved conflicts (see hg resolve, then hg rebase --continue)
|
|
[1]
|
|
|
|
Solve the conflict and go on:
|
|
|
|
$ echo 'conflict solved' > A
|
|
$ rm A.orig
|
|
$ hg resolve -m A
|
|
(no more unresolved files)
|
|
continue: hg rebase --continue
|
|
|
|
$ hg rebase --continue
|
|
already rebased 27547f69f254 "B" as 45396c49d53b
|
|
rebasing 965c486023db "C"
|
|
|
|
$ tglogp
|
|
o d2d25e26288e draft 'C'
|
|
│
|
|
│ o deb5d2f93d8b draft 'Extra'
|
|
│ │
|
|
o │ 45396c49d53b draft 'B'
|
|
│ │
|
|
@ │ ae36e8e3dfd7 draft 'E'
|
|
│ │
|
|
o │ 46b37eabc604 draft 'D'
|
|
│ │
|
|
│ x 965c486023db draft 'C'
|
|
│ │
|
|
│ x 27547f69f254 draft 'B'
|
|
├─╯
|
|
o 4a2df7238c3b draft 'A'
|
|
|
|
$ cd ..
|
|
|
|
|
|
Changes during an interruption - abort:
|
|
|
|
$ hg clone -q -u . a a2
|
|
$ cd a2
|
|
|
|
$ tglog
|
|
@ ae36e8e3dfd7 'E'
|
|
│
|
|
o 46b37eabc604 'D'
|
|
│
|
|
│ o 965c486023db 'C'
|
|
│ │
|
|
│ o 27547f69f254 'B'
|
|
├─╯
|
|
o 4a2df7238c3b 'A'
|
|
|
|
Rebasing B onto E:
|
|
|
|
$ hg rebase -s 'desc(B)' -d 'desc(E)'
|
|
rebasing 27547f69f254 "B"
|
|
rebasing 965c486023db "C"
|
|
merging A
|
|
warning: 1 conflicts while merging A! (edit, then use 'hg resolve --mark')
|
|
unresolved conflicts (see hg resolve, then hg rebase --continue)
|
|
[1]
|
|
|
|
Force a commit on B' during the interruption:
|
|
|
|
$ hg up -q -C 'max(desc(B))' --config 'extensions.rebase=!'
|
|
|
|
$ echo 'Extra' > Extra
|
|
$ hg add Extra
|
|
$ hg ci -m 'Extra' --config 'extensions.rebase=!'
|
|
|
|
$ tglog
|
|
@ 402ee3642b59 'Extra'
|
|
│
|
|
o 45396c49d53b 'B'
|
|
│
|
|
o ae36e8e3dfd7 'E'
|
|
│
|
|
o 46b37eabc604 'D'
|
|
│
|
|
│ o 965c486023db 'C'
|
|
│ │
|
|
│ x 27547f69f254 'B'
|
|
├─╯
|
|
o 4a2df7238c3b 'A'
|
|
|
|
Abort the rebasing:
|
|
|
|
$ hg rebase --abort
|
|
warning: new changesets detected on destination branch, can't strip
|
|
rebase aborted
|
|
|
|
$ tglog
|
|
@ 402ee3642b59 'Extra'
|
|
│
|
|
o 45396c49d53b 'B'
|
|
│
|
|
o ae36e8e3dfd7 'E'
|
|
│
|
|
o 46b37eabc604 'D'
|
|
│
|
|
│ o 965c486023db 'C'
|
|
│ │
|
|
│ x 27547f69f254 'B'
|
|
├─╯
|
|
o 4a2df7238c3b 'A'
|
|
|
|
$ cd ..
|
|
|
|
Changes during an interruption - abort (again):
|
|
|
|
$ hg clone -q -u . a a3
|
|
$ cd a3
|
|
|
|
$ tglogp
|
|
@ ae36e8e3dfd7 draft 'E'
|
|
│
|
|
o 46b37eabc604 draft 'D'
|
|
│
|
|
│ o 965c486023db draft 'C'
|
|
│ │
|
|
│ o 27547f69f254 draft 'B'
|
|
├─╯
|
|
o 4a2df7238c3b draft 'A'
|
|
|
|
Rebasing B onto E:
|
|
|
|
$ hg rebase -s 'desc(B)' -d 'desc(E)'
|
|
rebasing 27547f69f254 "B"
|
|
rebasing 965c486023db "C"
|
|
merging A
|
|
warning: 1 conflicts while merging A! (edit, then use 'hg resolve --mark')
|
|
unresolved conflicts (see hg resolve, then hg rebase --continue)
|
|
[1]
|
|
|
|
Change phase on B and B'
|
|
|
|
$ hg up -q -C 'max(desc(B))' --config 'extensions.rebase=!'
|
|
$ hg debugmakepublic 'desc(B)'
|
|
|
|
$ tglogp
|
|
@ 45396c49d53b public 'B'
|
|
│
|
|
o ae36e8e3dfd7 public 'E'
|
|
│
|
|
o 46b37eabc604 public 'D'
|
|
│
|
|
│ o 965c486023db draft 'C'
|
|
│ │
|
|
│ o 27547f69f254 public 'B'
|
|
├─╯
|
|
o 4a2df7238c3b public 'A'
|
|
|
|
Abort the rebasing:
|
|
|
|
$ hg rebase --abort
|
|
warning: can't clean up public changesets 45396c49d53b
|
|
rebase aborted
|
|
|
|
$ tglogp
|
|
@ 45396c49d53b public 'B'
|
|
│
|
|
o ae36e8e3dfd7 public 'E'
|
|
│
|
|
o 46b37eabc604 public 'D'
|
|
│
|
|
│ o 965c486023db draft 'C'
|
|
│ │
|
|
│ o 27547f69f254 public 'B'
|
|
├─╯
|
|
o 4a2df7238c3b public 'A'
|
|
|
|
Test rebase interrupted by hooks
|
|
|
|
$ hg up 'desc(C)'
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ echo F > F
|
|
$ hg add F
|
|
$ hg ci -m F
|
|
|
|
$ cd ..
|
|
|
|
(precommit version)
|
|
|
|
$ cp -R a3 hook-precommit
|
|
$ cd hook-precommit
|
|
$ hg rebase --source 'desc(C)' --dest 'max(desc(B))' --tool internal:other --config 'hooks.precommit=hg status | grep "M A"'
|
|
rebasing 965c486023db "C"
|
|
M A
|
|
rebasing a0b2430ebfb8 "F"
|
|
abort: precommit hook exited with status 1
|
|
[255]
|
|
$ tglogp
|
|
@ 401ccec5e39f draft 'C'
|
|
│
|
|
│ @ a0b2430ebfb8 draft 'F'
|
|
│ │
|
|
o │ 45396c49d53b public 'B'
|
|
│ │
|
|
o │ ae36e8e3dfd7 public 'E'
|
|
│ │
|
|
o │ 46b37eabc604 public 'D'
|
|
│ │
|
|
│ x 965c486023db draft 'C'
|
|
│ │
|
|
│ o 27547f69f254 public 'B'
|
|
├─╯
|
|
o 4a2df7238c3b public 'A'
|
|
|
|
$ hg rebase --continue
|
|
already rebased 965c486023db "C" as 401ccec5e39f
|
|
rebasing a0b2430ebfb8 "F"
|
|
$ tglogp
|
|
@ 6e92a149ac6b draft 'F'
|
|
│
|
|
o 401ccec5e39f draft 'C'
|
|
│
|
|
o 45396c49d53b public 'B'
|
|
│
|
|
o ae36e8e3dfd7 public 'E'
|
|
│
|
|
o 46b37eabc604 public 'D'
|
|
│
|
|
│ o 27547f69f254 public 'B'
|
|
├─╯
|
|
o 4a2df7238c3b public 'A'
|
|
|
|
$ cd ..
|
|
|
|
(pretxncommit version)
|
|
|
|
$ cp -R a3 hook-pretxncommit
|
|
$ cd hook-pretxncommit
|
|
#if windows
|
|
$ NODE="%HG_NODE%"
|
|
#else
|
|
$ NODE="\$HG_NODE"
|
|
#endif
|
|
$ hg rebase --source 'desc(C)' --dest 'max(desc(B))' --tool internal:other --config "hooks.pretxncommit=hg log -r $NODE | grep \"summary: C\""
|
|
rebasing 965c486023db "C"
|
|
summary: C
|
|
rebasing a0b2430ebfb8 "F"
|
|
abort: pretxncommit hook exited with status 1
|
|
[255]
|
|
$ tglogp
|
|
@ 401ccec5e39f draft 'C'
|
|
│
|
|
│ @ a0b2430ebfb8 draft 'F'
|
|
│ │
|
|
o │ 45396c49d53b public 'B'
|
|
│ │
|
|
o │ ae36e8e3dfd7 public 'E'
|
|
│ │
|
|
o │ 46b37eabc604 public 'D'
|
|
│ │
|
|
│ x 965c486023db draft 'C'
|
|
│ │
|
|
│ o 27547f69f254 public 'B'
|
|
├─╯
|
|
o 4a2df7238c3b public 'A'
|
|
|
|
$ hg rebase --continue
|
|
already rebased 965c486023db "C" as 401ccec5e39f
|
|
rebasing a0b2430ebfb8 "F"
|
|
$ tglogp
|
|
@ 6e92a149ac6b draft 'F'
|
|
│
|
|
o 401ccec5e39f draft 'C'
|
|
│
|
|
o 45396c49d53b public 'B'
|
|
│
|
|
o ae36e8e3dfd7 public 'E'
|
|
│
|
|
o 46b37eabc604 public 'D'
|
|
│
|
|
│ o 27547f69f254 public 'B'
|
|
├─╯
|
|
o 4a2df7238c3b public 'A'
|
|
|
|
$ cd ..
|
|
|
|
(pretxnclose version)
|
|
|
|
$ cp -R a3 hook-pretxnclose
|
|
$ cd hook-pretxnclose
|
|
$ hg rebase --source 'desc(C)' --dest 'max(desc(B))' --tool internal:other --config 'hooks.pretxnclose=hg log -r "max(_all())" | grep "summary: C"'
|
|
rebasing 965c486023db "C"
|
|
summary: C
|
|
rebasing a0b2430ebfb8 "F"
|
|
transaction abort!
|
|
rollback completed
|
|
abort: pretxnclose hook exited with status 1
|
|
[255]
|
|
$ tglogp
|
|
@ 401ccec5e39f draft 'C'
|
|
│
|
|
│ @ a0b2430ebfb8 draft 'F'
|
|
│ │
|
|
o │ 45396c49d53b public 'B'
|
|
│ │
|
|
o │ ae36e8e3dfd7 public 'E'
|
|
│ │
|
|
o │ 46b37eabc604 public 'D'
|
|
│ │
|
|
│ x 965c486023db draft 'C'
|
|
│ │
|
|
│ o 27547f69f254 public 'B'
|
|
├─╯
|
|
o 4a2df7238c3b public 'A'
|
|
|
|
$ hg rebase --continue
|
|
already rebased 965c486023db "C" as 401ccec5e39f
|
|
rebasing a0b2430ebfb8 "F"
|
|
$ tglogp
|
|
@ 6e92a149ac6b draft 'F'
|
|
│
|
|
o 401ccec5e39f draft 'C'
|
|
│
|
|
o 45396c49d53b public 'B'
|
|
│
|
|
o ae36e8e3dfd7 public 'E'
|
|
│
|
|
o 46b37eabc604 public 'D'
|
|
│
|
|
│ o 27547f69f254 public 'B'
|
|
├─╯
|
|
o 4a2df7238c3b public 'A'
|
|
|
|
$ cd ..
|
|
|
|
Make sure merge state is cleaned up after a no-op rebase merge (issue5494)
|
|
$ hg init repo
|
|
$ cd repo
|
|
$ echo a > a
|
|
$ hg commit -qAm base
|
|
$ echo b >> a
|
|
$ hg commit -qm b
|
|
$ hg up '.^'
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ echo c >> a
|
|
$ hg commit -qm c
|
|
$ hg rebase -s 'max(desc(b))' -d 'desc(c)' --noninteractive
|
|
rebasing fdaca8533b86 "b"
|
|
merging a
|
|
warning: 1 conflicts while merging a! (edit, then use 'hg resolve --mark')
|
|
unresolved conflicts (see hg resolve, then hg rebase --continue)
|
|
[1]
|
|
$ echo a > a
|
|
$ echo c >> a
|
|
$ hg resolve --mark a
|
|
(no more unresolved files)
|
|
continue: hg rebase --continue
|
|
$ hg rebase --continue
|
|
rebasing fdaca8533b86 "b"
|
|
note: rebase of fdaca8533b86 created no changes to commit
|
|
$ hg resolve --list
|
|
$ test -f .hg/merge
|
|
[1]
|