scmutil: make cleanupnodes delete divergent bookmarks
cleanupnodes takes care of bookmark movement, and bookmark movement could
cause bookmark divergent resolution as a side effect. This patch adds such
bookmark divergent resolution logic so future rebase migration will be
easier.
The revset is carefully written to be equivalent to what rebase does today.
Although I think it might make sense to remove divergent bookmarks more
aggressively, for example:
F book@1
|
E book@2
|
| D book
| |
| C
|/
B book@3
|
A
When rebase -s C -d E, "book@1" will be removed, "book@3" will be kept,
and the end result is:
D book
|
C
|
F
|
E book@2 (?)
|
B book@3
|
A
The question is should we keep book@2? The current logic keeps it. If we
choose not to (makes some sense to me), the "deleterevs" revset could be
simplified to "newnode % oldnode".
For now, I just make it compatible with the existing behavior. If we want to
make the "deleterevs" revset simpler, we can always do it in the future.
$ cat <<EOF >> $HGRCPATH
> [extensions]
> mq =
> [mq]
> git = keep
> EOF
$ hg init a
$ cd a
$ echo 'base' > base
$ hg ci -Ambase
adding base
$ hg qnew -mmqbase mqbase
$ echo 'patched' > base
$ hg qrefresh
qdiff:
$ hg qdiff
diff -r d20a80d4def3 base
--- a/base Thu Jan 01 00:00:00 1970 +0000
+++ b/base* (glob)
@@ -1,1 +1,1 @@
-base
+patched
qdiff dirname:
$ hg qdiff --nodates .
diff -r d20a80d4def3 base
--- a/base
+++ b/base
@@ -1,1 +1,1 @@
-base
+patched
qdiff filename:
$ hg qdiff --nodates base
diff -r d20a80d4def3 base
--- a/base
+++ b/base
@@ -1,1 +1,1 @@
-base
+patched
$ hg revert -a
$ hg qpop
popping mqbase
patch queue now empty
$ hg qdelete mqbase
$ printf '1\n2\n3\n4\nhello world\ngoodbye world\n7\n8\n9\n' > lines
$ hg ci -Amlines -d '2 0'
adding lines
$ hg qnew -mmqbase2 mqbase2
$ printf '\n\n1\n2\n3\n4\nhello world\n goodbye world\n7\n8\n9\n' > lines
$ hg qdiff --nodates -U 1
diff -r b0c220e1cf43 lines
--- a/lines
+++ b/lines
@@ -1,1 +1,3 @@
+
+
1
@@ -4,4 +6,4 @@
4
-hello world
-goodbye world
+hello world
+ goodbye world
7
$ hg qdiff --nodates -b
diff -r b0c220e1cf43 lines
--- a/lines
+++ b/lines
@@ -1,9 +1,11 @@
+
+
1
2
3
4
hello world
-goodbye world
+ goodbye world
7
8
9
$ hg qdiff --nodates -U 1 -B
diff -r b0c220e1cf43 lines
--- a/lines
+++ b/lines
@@ -4,4 +4,4 @@
4
-hello world
-goodbye world
+hello world
+ goodbye world
7
$ hg qdiff --nodates -w
diff -r b0c220e1cf43 lines
--- a/lines
+++ b/lines
@@ -1,3 +1,5 @@
+
+
1
2
3
$ hg qdiff --nodates --reverse
diff -r b0c220e1cf43 lines
--- a/lines
+++ b/lines
@@ -1,11 +1,9 @@
-
-
1
2
3
4
-hello world
- goodbye world
+hello world
+goodbye world
7
8
9
qdiff preserve existing git flag:
$ hg qrefresh --git
$ echo a >> lines
$ hg qdiff
diff --git a/lines b/lines
--- a/lines
+++ b/lines
@@ -1,9 +1,12 @@
+
+
1
2
3
4
-hello world
-goodbye world
+hello world
+ goodbye world
7
8
9
+a
$ hg qdiff --stat
lines | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
$ hg qrefresh
qdiff when file deleted (but not removed) in working dir:
$ hg qnew deleted-file
$ echo a > newfile
$ hg add newfile
$ hg qrefresh
$ rm newfile
$ hg qdiff
$ cd ..