tests: stabilise mq rebase tests

Prepare for including hashes in output ... and less globbing make the tests
easier to update.

tests/test-rebase-mq-skip.t

@@ -1,139 +1,139 b''
 This emulates the effects of an hg pull --rebase in which the remote repo
 already has one local mq patch
 
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > rebase=
   > mq=
   > 
   > [phases]
   > publish=False
   > 
   > [alias]
   > tglog = log -G --template "{rev}: '{desc}' tags: {tags}\n"
   > EOF
 
 
   $ hg init a
   $ cd a
   $ hg qinit -c
 
   $ echo c1 > c1
   $ hg add c1
   $ hg ci -m C1
 
   $ echo r1 > r1
   $ hg add r1
   $ hg ci -m R1
 
   $ hg up -q 0
 
-  $ hg qnew p0.patch
+  $ hg qnew p0.patch -d '1 0'
   $ echo p0 > p0
   $ hg add p0
   $ hg qref -m P0
 
-  $ hg qnew p1.patch
+  $ hg qnew p1.patch -d '2 0'
   $ echo p1 > p1
   $ hg add p1
   $ hg qref -m P1
 
   $ hg export qtip > p1.patch
 
   $ hg up -q -C 1
 
   $ hg import p1.patch
   applying p1.patch
 
   $ rm p1.patch
 
   $ hg up -q -C qtip
 
   $ hg rebase
-  saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
+  saved backup bundle to $TESTTMP/a/.hg/strip-backup/13a46ce44f60-backup.hg (glob)
 
   $ hg tglog
   @  3: 'P0' tags: p0.patch qbase qtip tip
   |
   o  2: 'P1' tags: qparent
   |
   o  1: 'R1' tags:
   |
   o  0: 'C1' tags:
   
   $ cd ..
 
 
   $ hg init b
   $ cd b
   $ hg qinit -c
 
   $ for i in r0 r1 r2 r3 r4 r5 r6;
   > do
   >     echo $i > $i
   >     hg ci -Am $i
   > done
   adding r0
   adding r1
   adding r2
   adding r3
   adding r4
   adding r5
   adding r6
 
   $ hg qimport -r 1:tip
 
   $ hg up -q 0
 
   $ for i in r1 r3 r7 r8;
   > do
   >     echo $i > $i
   >     hg ci -Am branch2-$i
   > done
   adding r1
   created new head
   adding r3
   adding r7
   adding r8
 
   $ echo somethingelse > r4
   $ hg ci -Am branch2-r4
   adding r4
 
   $ echo r6 > r6
   $ hg ci -Am branch2-r6
   adding r6
 
   $ hg up -q qtip
 
   $ HGMERGE=internal:fail hg rebase
   unresolved conflicts (see hg resolve, then hg rebase --continue)
   [1]
 
   $ HGMERGE=internal:local hg resolve --all
   (no more unresolved files)
 
   $ hg rebase --continue
-  saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)
+  saved backup bundle to $TESTTMP/b/.hg/strip-backup/b4bffa6e4776-backup.hg (glob)
 
   $ hg tglog
   @  8: 'r5' tags: 5.diff qtip tip
   |
   o  7: 'r2' tags: 2.diff qbase
   |
   o  6: 'branch2-r6' tags: qparent
   |
   o  5: 'branch2-r4' tags:
   |
   o  4: 'branch2-r8' tags:
   |
   o  3: 'branch2-r7' tags:
   |
   o  2: 'branch2-r3' tags:
   |
   o  1: 'branch2-r1' tags:
   |
   o  0: 'r0' tags:
   
 
   $ cd ..

tests/test-rebase-mq.t

@@ -1,348 +1,352 b''
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > rebase=
   > mq=
   > 
   > [mq]
   > plain=true
   > 
   > [alias]
   > tglog = log -G --template "{rev}: '{desc}' tags: {tags}\n"
   > EOF
 
 
   $ hg init a
   $ cd a
   $ hg qinit -c
 
   $ echo c1 > f
   $ hg add f
   $ hg ci -m C1
 
   $ echo r1 > f
   $ hg ci -m R1
 
   $ hg up -q 0
 
-  $ hg qnew f.patch
+  $ hg qnew f.patch -d '1 0'
   $ echo mq1 > f
   $ hg qref -m P0
 
   $ hg qnew f2.patch
   $ echo mq2 > f
-  $ hg qref -m P1
+  $ hg qref -m P1 -d '2 0'
 
   $ hg tglog
   @  3: 'P1' tags: f2.patch qtip tip
   |
   o  2: 'P0' tags: f.patch qbase
   |
   | o  1: 'R1' tags:
   |/
   o  0: 'C1' tags: qparent
   
 
 Rebase - try to rebase on an applied mq patch:
 
   $ hg rebase -s 1 -d 3
   abort: cannot rebase onto an applied mq patch
   [255]
 
 Rebase - same thing, but mq patch is default dest:
 
   $ hg up -q 1
   $ hg rebase
   abort: cannot rebase onto an applied mq patch
   [255]
   $ hg up -q qtip
 
 Rebase - generate a conflict:
 
   $ hg rebase -s 2 -d 1
   merging f
   warning: conflicts during merge.
   merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
   unresolved conflicts (see hg resolve, then hg rebase --continue)
   [1]
 
 Fix the 1st conflict:
 
   $ echo mq1r1 > f
   $ hg resolve -m f
   (no more unresolved files)
   $ hg rebase -c
   merging f
   warning: conflicts during merge.
   merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
   unresolved conflicts (see hg resolve, then hg rebase --continue)
   [1]
 
 Fix the 2nd conflict:
 
   $ echo mq1r1mq2 > f
   $ hg resolve -m f
   (no more unresolved files)
   $ hg rebase -c
-  saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
+  saved backup bundle to $TESTTMP/a/.hg/strip-backup/3504f44bffc0-backup.hg (glob)
 
   $ hg tglog
   @  3: 'P1' tags: f2.patch qtip tip
   |
   o  2: 'P0' tags: f.patch qbase
   |
   o  1: 'R1' tags: qparent
   |
   o  0: 'C1' tags:
   
   $ hg up -q qbase
 
   $ cat f
   mq1r1
 
   $ cat .hg/patches/f.patch
   # HG changeset patch
   # User test
-  # Date ?????????? ? (glob)
-  #      * (glob)
-  # Node ID ???????????????????????????????????????? (glob)
+  # Date 1 0
+  #      Thu Jan 01 00:00:01 1970 +0000
+  # Node ID ebe9914c0d1c3f60096e952fa4dbb3d377dea3ab
   # Parent  bac9ed9960d8992bcad75864a879fa76cadaf1b0
   P0
   
-  diff -r bac9ed9960d8 -r ???????????? f (glob)
+  diff -r bac9ed9960d8 -r ebe9914c0d1c f
   --- a/f	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/f	??? ??? ?? ??:??:?? ???? ????? (glob)
+  +++ b/f	Thu Jan 01 00:00:01 1970 +0000
   @@ -1,1 +1,1 @@
   -r1
   +mq1r1
 
 Update to qtip:
 
   $ hg up -q qtip
 
   $ cat f
   mq1r1mq2
 
   $ cat .hg/patches/f2.patch
   # HG changeset patch
   # User test
-  # Date ?????????? ? (glob)
-  #      * (glob)
-  # Node ID ???????????????????????????????????????? (glob)
-  # Parent  ???????????????????????????????????????? (glob)
+  # Date 2 0
+  #      Thu Jan 01 00:00:02 1970 +0000
+  # Node ID 462012cf340c97d44d62377c985a423f6bb82f07
+  # Parent  ebe9914c0d1c3f60096e952fa4dbb3d377dea3ab
   P1
   
-  diff -r ???????????? -r ???????????? f (glob)
-  --- a/f	??? ??? ?? ??:??:?? ???? ????? (glob)
-  +++ b/f	??? ??? ?? ??:??:?? ???? ????? (glob)
+  diff -r ebe9914c0d1c -r 462012cf340c f
+  --- a/f	Thu Jan 01 00:00:01 1970 +0000
+  +++ b/f	Thu Jan 01 00:00:02 1970 +0000
   @@ -1,1 +1,1 @@
   -mq1r1
   +mq1r1mq2
 
 Adding one git-style patch and one normal:
 
   $ hg qpop -a
   popping f2.patch
   popping f.patch
   patch queue now empty
 
   $ rm -fr .hg/patches
   $ hg qinit -c
 
   $ hg up -q 0
 
-  $ hg qnew --git f_git.patch
+  $ hg qnew --git f_git.patch -d '3 0'
   $ echo mq1 > p
   $ hg add p
   $ hg qref --git -m 'P0 (git)'
 
-  $ hg qnew f.patch
+  $ hg qnew f.patch -d '4 0'
   $ echo mq2 > p
   $ hg qref -m P1
   $ hg qci -m 'save patch state'
 
   $ hg qseries -s
   f_git.patch: P0 (git)
   f.patch: P1
 
   $ hg -R .hg/patches manifest
   .hgignore
   f.patch
   f_git.patch
   series
 
   $ cat .hg/patches/f_git.patch
+  Date: 3 0
+  
   P0 (git)
   
   diff --git a/p b/p
   new file mode 100644
   --- /dev/null
   +++ b/p
   @@ -0,0 +1,1 @@
   +mq1
 
   $ cat .hg/patches/f.patch
+  Date: 4 0
+  
   P1
   
   diff -r ???????????? p (glob)
   --- a/p	??? ??? ?? ??:??:?? ???? ????? (glob)
   +++ b/p	??? ??? ?? ??:??:?? ???? ????? (glob)
   @@ -1,1 +1,1 @@
   -mq1
   +mq2
 
 
 Rebase the applied mq patches:
 
   $ hg rebase -s 2 -d 1
-  saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
+  saved backup bundle to $TESTTMP/a/.hg/strip-backup/0c587ffcb480-backup.hg (glob)
 
   $ hg qci -m 'save patch state'
 
   $ hg qseries -s
   f_git.patch: P0 (git)
   f.patch: P1
 
   $ hg -R .hg/patches manifest
   .hgignore
   f.patch
   f_git.patch
   series
 
   $ cat .hg/patches/f_git.patch
   # HG changeset patch
   # User test
-  # Date ?????????? ? (glob)
-  #      * (glob)
-  # Node ID ???????????????????????????????????????? (glob)
+  # Date 3 0
+  #      Thu Jan 01 00:00:03 1970 +0000
+  # Node ID 12d9f6a3bbe560dee50c7c454d434add7fb8e837
   # Parent  bac9ed9960d8992bcad75864a879fa76cadaf1b0
   P0 (git)
   
   diff --git a/p b/p
   new file mode 100644
   --- /dev/null
   +++ b/p
   @@ -0,0 +1,1 @@
   +mq1
 
   $ cat .hg/patches/f.patch
   # HG changeset patch
   # User test
-  # Date ?????????? ? (glob)
-  #      * (glob)
-  # Node ID ???????????????????????????????????????? (glob)
-  # Parent  ???????????????????????????????????????? (glob)
+  # Date 4 0
+  #      Thu Jan 01 00:00:04 1970 +0000
+  # Node ID c77a2661c64c60d82f63c4f7aefd95b3a948a557
+  # Parent  12d9f6a3bbe560dee50c7c454d434add7fb8e837
   P1
   
-  diff -r ???????????? -r ???????????? p (glob)
-  --- a/p	??? ??? ?? ??:??:?? ???? ????? (glob)
-  +++ b/p	??? ??? ?? ??:??:?? ???? ????? (glob)
+  diff -r 12d9f6a3bbe5 -r c77a2661c64c p
+  --- a/p	Thu Jan 01 00:00:03 1970 +0000
+  +++ b/p	Thu Jan 01 00:00:04 1970 +0000
   @@ -1,1 +1,1 @@
   -mq1
   +mq2
 
   $ cd ..
 
 Rebase with guards
 
   $ hg init foo
   $ cd foo
   $ echo a > a
   $ hg ci -Am a
   adding a
 
 Create mq repo with guarded patches foo and bar and empty patch:
 
   $ hg qinit
   $ echo guarded > guarded
   $ hg add guarded
   $ hg qnew guarded
-  $ hg qnew empty-important -m 'important commit message'
+  $ hg qnew empty-important -m 'important commit message' -d '1 0'
   $ echo bar > bar
   $ hg add bar
-  $ hg qnew bar
+  $ hg qnew bar -d '2 0'
   $ echo foo > foo
   $ hg add foo
   $ hg qnew foo
   $ hg qpop -a
   popping foo
   popping bar
   popping empty-important
   popping guarded
   patch queue now empty
   $ hg qguard guarded +guarded
   $ hg qguard bar +baz
   $ hg qguard foo +baz
   $ hg qselect baz
   number of unguarded, unapplied patches has changed from 1 to 3
   $ hg qpush bar
   applying empty-important
   patch empty-important is empty
   applying bar
   now at: bar
 
   $ hg qguard -l
   guarded: +guarded
   empty-important: unguarded
   bar: +baz
   foo: +baz
 
   $ hg tglog
   @  2: 'imported patch bar' tags: bar qtip tip
   |
   o  1: 'important commit message' tags: empty-important qbase
   |
   o  0: 'a' tags: qparent
   
 Create new head to rebase bar onto:
 
   $ hg up -C 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo b > b
   $ hg add b
   $ hg ci -m b
   created new head
   $ hg up -C 2
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo a >> a
   $ hg qref
 
   $ hg tglog
   @  3: '[mq]: bar' tags: bar qtip tip
   |
   | o  2: 'b' tags:
   | |
   o |  1: 'important commit message' tags: empty-important qbase
   |/
   o  0: 'a' tags: qparent
   
 
 Rebase bar (make sure series order is preserved and empty-important also is
 removed from the series):
 
   $ hg qseries
   guarded
   empty-important
   bar
   foo
   $ [ -f .hg/patches/empty-important ]
   $ hg -q rebase -d 2
   $ hg qseries
   guarded
   bar
   foo
   $ [ -f .hg/patches/empty-important ]
   [1]
 
   $ hg qguard -l
   guarded: +guarded
   bar: +baz
   foo: +baz
 
   $ hg tglog
-  @  2:* '[mq]: bar' tags: bar qbase qtip tip (glob)
+  @  2: '[mq]: bar' tags: bar qbase qtip tip
   |
-  o  1:* 'b' tags: qparent (glob)
+  o  1: 'b' tags: qparent
   |
-  o  0:* 'a' tags: (glob)
+  o  0: 'a' tags:
   
   $ cd ..