rebase: format commit in usual way when explaining that it became empty
authorMartin von Zweigbergk <martinvonz@google.com>
Fri, 07 Dec 2018 14:17:09 -0800
changeset 53629 09680349cc2d9363bcd9b6bc7d9f865d69c14911
parent 53628 443eb4bc41af00cafefcf235f15bad24b1ea56a1
child 53630 4edd427f34c14523647ef19fe9ba2bd8d939e87f
push id1079
push usergszorc@mozilla.com
push dateMon, 10 Dec 2018 19:44:59 +0000
rebase: format commit in usual way when explaining that it became empty We use the _ctxdesc() for other similar messages, so it seems we should use it here too. Differential Revision: https://phab.mercurial-scm.org/D5394
hgext/rebase.py
tests/test-rebase-abort.t
tests/test-rebase-cache.t
tests/test-rebase-collapse.t
tests/test-rebase-detach.t
tests/test-rebase-emptycommit.t
tests/test-rebase-interruptions.t
tests/test-rebase-mq-skip.t
tests/test-rebase-mq.t
tests/test-rebase-named-branches.t
tests/test-rebase-newancestor.t
tests/test-rebase-obsolete.t
tests/test-rebase-parameters.t
tests/test-rebase-scenario-global.t
tests/test-remotefilelog-linknodes.t
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -568,18 +568,18 @@ class rebaseruntime(object):
                     repo.setparents(repo[p1].node())
                 newnode = None
             # Update the state
             if newnode is not None:
                 self.state[rev] = repo[newnode].rev()
                 ui.debug('rebased as %s\n' % short(newnode))
             else:
                 if not self.collapsef:
-                    ui.warn(_('note: rebase of %d:%s created no changes '
-                              'to commit\n') % (rev, ctx))
+                    ui.warn(_('note: rebase of %s created no changes '
+                              'to commit\n') % desc)
                     self.skipped.add(rev)
                 self.state[rev] = p1
                 ui.debug('next revision set to %d\n' % p1)
         else:
             ui.status(_('already rebased %s as %s\n') %
                       (desc, repo[self.state[rev]]))
         if not tr:
             # When not using single transaction, store state after each
--- a/tests/test-rebase-abort.t
+++ b/tests/test-rebase-abort.t
@@ -201,17 +201,17 @@ Rebase and abort without generating new 
   | o  2:secret 'C'
   | |
   | o  1:public 'B'
   |/
   o  0:public 'A'
   
   $ hg rebase -b 4 -d 2
   rebasing 3:a6484957d6b9 "B bis"
-  note: rebase of 3:a6484957d6b9 created no changes to commit
+  note: rebase of 3:a6484957d6b9 "B bis" created no changes to commit
   rebasing 4:145842775fec "C1" (tip)
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see hg resolve, then hg rebase --continue)
   [1]
 
   $ hg tglog
   @  4:draft 'C1'
@@ -488,16 +488,16 @@ setup the draft branch that will be reba
   $ echo 'content' > disappear
 commit will disappear
   $ hg commit -A -m 'disappear draft' -q
   $ echo 'addedcontADDEDentadded' > root
 commit will cause merge conflict on rebase
   $ hg commit -m 'add content draft' -q
 
   $ hg rebase -d 'public()' --tool :merge -q
-  note: rebase of 3:0682fd3dabf5 created no changes to commit
+  note: rebase of 3:0682fd3dabf5 "disappear draft" created no changes to commit
   warning: conflicts while merging root! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see hg resolve, then hg rebase --continue)
   [1]
   $ hg rebase --abort
   rebase aborted
   $ cd ..
 
--- a/tests/test-rebase-cache.t
+++ b/tests/test-rebase-cache.t
@@ -226,17 +226,17 @@ Rebase entire branch3 (7-8) onto branch2
   | o  2: 'B' branch1
   | |
   | o  1: 'branch1' branch1
   |/
   o  0: 'A'
   
   $ hg rebase -s 7 -d 6
   rebasing 7:653b9feb4616 "branch3"
-  note: rebase of 7:653b9feb4616 created no changes to commit
+  note: rebase of 7:653b9feb4616 "branch3" created no changes to commit
   rebasing 8:4666b71e8e32 "F" (tip)
   saved backup bundle to $TESTTMP/a3/.hg/strip-backup/653b9feb4616-3c88de16-rebase.hg
 
   $ hg branches
   branch2                        7:6b4bdc1b5ac0
   branch1                        2:0a03079c47fd (inactive)
   default                        0:1994f17a630e (inactive)
 
--- a/tests/test-rebase-collapse.t
+++ b/tests/test-rebase-collapse.t
@@ -495,17 +495,17 @@ Interactions between collapse and keepbr
   | o  2: 8ac4a08debf1 'C' two
   | |
   | o  1: 1ba175478953 'B' one
   |/
   o  0: 1994f17a630e 'A'
   
   $ hg rebase -s 5 -d 4
   rebasing 5:fbfb97b1089a "E" (tip)
-  note: rebase of 5:fbfb97b1089a created no changes to commit
+  note: rebase of 5:fbfb97b1089a "E" (tip) created no changes to commit
   saved backup bundle to $TESTTMP/e/.hg/strip-backup/fbfb97b1089a-553e1d85-rebase.hg
   $ hg tglog
   @  4: f338eb3c2c7c 'E'
   |
   o  3: 41acb9dca9eb 'D'
   |
   | o  2: 8ac4a08debf1 'C' two
   | |
--- a/tests/test-rebase-detach.t
+++ b/tests/test-rebase-detach.t
@@ -299,17 +299,17 @@ Ensure --continue restores a correct sta
   warning: conflicts while merging B! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see hg resolve, then hg rebase --continue)
   [1]
   $ hg resolve --all -t internal:local
   (no more unresolved files)
   continue: hg rebase --continue
   $ hg rebase -c
   rebasing 3:17b4880d2402 "B2" (tip)
-  note: rebase of 3:17b4880d2402 created no changes to commit
+  note: rebase of 3:17b4880d2402 "B2" (tip) created no changes to commit
   saved backup bundle to $TESTTMP/a7/.hg/strip-backup/17b4880d2402-1ae1f6cc-rebase.hg
   $ hg  log -G --template "{rev}:{phase} '{desc}' {branches}\n"
   o  2:draft 'C'
   |
   | @  1:draft 'B'
   |/
   o  0:draft 'A'
   
--- a/tests/test-rebase-emptycommit.t
+++ b/tests/test-rebase-emptycommit.t
@@ -46,19 +46,19 @@
   o |  1 B
   |/
   o  0 A
   
 With --keep, bookmark should move
 
   $ hg rebase -r 3+4 -d E --keep
   rebasing 3:e7b3f00ed42e "D" (BOOK-D)
-  note: rebase of 3:e7b3f00ed42e created no changes to commit
+  note: rebase of 3:e7b3f00ed42e "D" (BOOK-D) created no changes to commit
   rebasing 4:69a34c08022a "E" (BOOK-E)
-  note: rebase of 4:69a34c08022a created no changes to commit
+  note: rebase of 4:69a34c08022a "E" (BOOK-E) created no changes to commit
   $ hg log -G -T '{rev} {desc} {bookmarks}'
   o  7 E BOOK-D BOOK-E
   |
   o  6 D
   |
   | o  5 F BOOK-F
   | |
   | o  4 E
@@ -79,19 +79,19 @@ Move D and E back for the next test
 Bookmark is usually an indication of a head. For changes that are introduced by
 an ancestor of bookmark B, after moving B to B-NEW, the changes are ideally
 still introduced by an ancestor of changeset on B-NEW. In the below case,
 "BOOK-D", and "BOOK-E" include changes introduced by "C".
 
   $ hg rebase -s 2 -d E
   rebasing 2:dc0947a82db8 "C" (BOOK-C C)
   rebasing 3:e7b3f00ed42e "D" (BOOK-D)
-  note: rebase of 3:e7b3f00ed42e created no changes to commit
+  note: rebase of 3:e7b3f00ed42e "D" (BOOK-D) created no changes to commit
   rebasing 4:69a34c08022a "E" (BOOK-E)
-  note: rebase of 4:69a34c08022a created no changes to commit
+  note: rebase of 4:69a34c08022a "E" (BOOK-E) created no changes to commit
   rebasing 5:6b2aeab91270 "F" (BOOK-F F)
   saved backup bundle to $TESTTMP/non-merge/.hg/strip-backup/dc0947a82db8-52bb4973-rebase.hg
   $ hg log -G -T '{rev} {desc} {bookmarks}'
   o  5 F BOOK-F
   |
   o  4 C BOOK-C BOOK-D BOOK-E
   |
   o  3 E
@@ -126,21 +126,21 @@ Merge and its ancestors all become empty
   > |
   > C
   > |
   > B
   > EOS
 
   $ hg rebase -r '(A::)-(B::)-A' -d H
   rebasing 2:dc0947a82db8 "C" (BOOK-C)
-  note: rebase of 2:dc0947a82db8 created no changes to commit
+  note: rebase of 2:dc0947a82db8 "C" (BOOK-C) created no changes to commit
   rebasing 3:b18e25de2cf5 "D" (BOOK-D)
-  note: rebase of 3:b18e25de2cf5 created no changes to commit
+  note: rebase of 3:b18e25de2cf5 "D" (BOOK-D) created no changes to commit
   rebasing 4:86a1f6686812 "E" (BOOK-E E)
-  note: rebase of 4:86a1f6686812 created no changes to commit
+  note: rebase of 4:86a1f6686812 "E" (BOOK-E E) created no changes to commit
   saved backup bundle to $TESTTMP/merge1/.hg/strip-backup/b18e25de2cf5-1fd0a4ba-rebase.hg
 
   $ hg log -G -T '{rev} {desc} {bookmarks}'
   o  4 H BOOK-C BOOK-D BOOK-E
   |
   o  3 D
   |
   o  2 C
@@ -175,21 +175,21 @@ Part of ancestors of a merge become empt
   > |
   > C
   > |
   > B
   > EOS
 
   $ hg rebase -r '(A::)-(B::)-A' -d H
   rebasing 2:dc0947a82db8 "C" (BOOK-C)
-  note: rebase of 2:dc0947a82db8 created no changes to commit
+  note: rebase of 2:dc0947a82db8 "C" (BOOK-C) created no changes to commit
   rebasing 3:b18e25de2cf5 "D" (BOOK-D D)
   rebasing 4:03ca77807e91 "E" (BOOK-E E)
   rebasing 5:ad6717a6a58e "F" (BOOK-F)
-  note: rebase of 5:ad6717a6a58e created no changes to commit
+  note: rebase of 5:ad6717a6a58e "F" (BOOK-F) created no changes to commit
   rebasing 6:c58e8bdac1f4 "G" (BOOK-G G)
   saved backup bundle to $TESTTMP/merge2/.hg/strip-backup/b18e25de2cf5-2d487005-rebase.hg
 
   $ hg log -G -T '{rev} {desc} {bookmarks}'
   o    7 G BOOK-G
   |\
   | o  6 E BOOK-E
   | |
--- a/tests/test-rebase-interruptions.t
+++ b/tests/test-rebase-interruptions.t
@@ -449,17 +449,17 @@ Make sure merge state is cleaned up afte
   [1]
   $ echo a > a
   $ echo c >> a
   $ hg resolve --mark a
   (no more unresolved files)
   continue: hg rebase --continue
   $ hg rebase --continue
   rebasing 1:fdaca8533b86 "b"
-  note: rebase of 1:fdaca8533b86 created no changes to commit
+  note: rebase of 1:fdaca8533b86 "b" created no changes to commit
   saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg
   $ hg resolve --list
   $ test -d .hg/merge
   [1]
 Now try again with --collapse
   $ hg unbundle -q .hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg
   $ hg rebase -s 2 -d 1 --noninteractive --collapse
   rebasing 2:fdaca8533b86 "b" (tip)
--- a/tests/test-rebase-mq-skip.t
+++ b/tests/test-rebase-mq-skip.t
@@ -57,17 +57,17 @@ already has one local mq patch
   resolving manifests
   getting p0
   committing files:
   p0
   committing manifest
   committing changelog
   rebasing 3:148775c71080 "P1" (p1.patch qtip)
   resolving manifests
-  note: rebase of 3:148775c71080 created no changes to commit
+  note: rebase of 3:148775c71080 "P1" (p1.patch qtip) created no changes to commit
   rebase merging completed
   updating mq patch p0.patch to 5:9ecc820b1737
   $TESTTMP/a/.hg/patches/p0.patch
   2 changesets found
   uncompressed size of bundle content:
        348 (changelog)
        324 (manifests)
        129  p0
@@ -138,37 +138,37 @@ already has one local mq patch
   $ echo r6 > r6
   $ hg ci -Am branch2-r6
   adding r6
 
   $ hg up -q qtip
 
   $ HGMERGE=internal:fail hg rebase
   rebasing 1:b4bffa6e4776 "r1" (qbase r1)
-  note: rebase of 1:b4bffa6e4776 created no changes to commit
+  note: rebase of 1:b4bffa6e4776 "r1" (qbase r1) created no changes to commit
   rebasing 2:c0fd129beb01 "r2" (r2)
   rebasing 3:6ff5b8feed8e "r3" (r3)
-  note: rebase of 3:6ff5b8feed8e created no changes to commit
+  note: rebase of 3:6ff5b8feed8e "r3" (r3) created no changes to commit
   rebasing 4:094320fec554 "r4" (r4)
   unresolved conflicts (see hg resolve, then hg rebase --continue)
   [1]
 
   $ HGMERGE=internal:local hg resolve --all
   (no more unresolved files)
   continue: hg rebase --continue
 
   $ hg rebase --continue
   already rebased 1:b4bffa6e4776 "r1" (qbase r1) as 057f55ff8f44
   already rebased 2:c0fd129beb01 "r2" (r2) as 1660ab13ce9a
   already rebased 3:6ff5b8feed8e "r3" (r3) as 1660ab13ce9a
   rebasing 4:094320fec554 "r4" (r4)
-  note: rebase of 4:094320fec554 created no changes to commit
+  note: rebase of 4:094320fec554 "r4" (r4) created no changes to commit
   rebasing 5:681a378595ba "r5" (r5)
   rebasing 6:512a1f24768b "r6" (qtip r6)
-  note: rebase of 6:512a1f24768b created no changes to commit
+  note: rebase of 6:512a1f24768b "r6" (qtip r6) created no changes to commit
   saved backup bundle to $TESTTMP/b/.hg/strip-backup/b4bffa6e4776-b9bfb84d-rebase.hg
 
   $ hg tglog
   @  8: 0b9735ce8f0a 'r5' tags: qtip r5 tip
   |
   o  7: 1660ab13ce9a 'r2' tags: qbase r2
   |
   o  6: 057f55ff8f44 'branch2-r6' tags: qparent
--- a/tests/test-rebase-mq.t
+++ b/tests/test-rebase-mq.t
@@ -332,17 +332,17 @@ removed from the series):
 
   $ hg qseries
   guarded
   empty-important
   bar
   foo
   $ [ -f .hg/patches/empty-important ]
   $ hg -q rebase -d 2
-  note: rebase of 1:0aaf4c3af7eb created no changes to commit
+  note: rebase of 1:0aaf4c3af7eb "important commit message" (empty-important qbase) created no changes to commit
   $ hg qseries
   guarded
   bar
   foo
   $ [ -f .hg/patches/empty-important ]
   [1]
 
   $ hg qguard -l
--- a/tests/test-rebase-named-branches.t
+++ b/tests/test-rebase-named-branches.t
@@ -152,17 +152,17 @@ Branch name containing a dash (issue3181
   o |  2: 5fddd98957c8 'C'
   | |
   o |  1: 42ccdea3bb16 'B'
   |/
   o  0: cd010b8cd998 'A'
   
   $ hg rebase -b 'max(branch("dev-two"))' -d dev-one --keepbranches
   rebasing 5:bc8139ee757c "dev-one named branch"
-  note: rebase of 5:bc8139ee757c created no changes to commit
+  note: rebase of 5:bc8139ee757c "dev-one named branch" created no changes to commit
   rebasing 6:42aa3cf0fa7a "F"
   rebasing 7:1a1e6f72ec38 "G"
   rebasing 8:904590360559 "H"
   rebasing 9:59c2e59309fe "dev-two named branch"
   saved backup bundle to $TESTTMP/a1/.hg/strip-backup/bc8139ee757c-f11c1080-rebase.hg
 
   $ hg tglog
   o  9: 71325f8bc082 'dev-two named branch' dev-two
@@ -324,17 +324,17 @@ Set up a case:
   
   $ hg clone -q . ../case2
 
 rebase 'b2' to another lower branch head
 
   $ hg up -qr 2
   $ hg rebase
   rebasing 2:792845bb77ee "b2"
-  note: rebase of 2:792845bb77ee created no changes to commit
+  note: rebase of 2:792845bb77ee "b2" created no changes to commit
   saved backup bundle to $TESTTMP/case1/.hg/strip-backup/792845bb77ee-627120ee-rebase.hg
   $ hg tglog
   o  2: c062e3ecd6c6 'c1' c
   |
   | @  1: 40039acb7ca5 'b1' b
   |/
   o  0: d681519c3ea7 '0'
   
@@ -390,17 +390,17 @@ rebase 'c1' to the branch head 'c2' that
 
   $ hg up -cr 1
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg branch x
   marked working directory as branch x
   $ hg rebase -r 3:: -d .
   rebasing 3:76abc1c6f8c7 "b1"
   rebasing 4:8427af5d86f2 "c2 closed" (tip)
-  note: rebase of 4:8427af5d86f2 created no changes to commit
+  note: rebase of 4:8427af5d86f2 "c2 closed" (tip) created no changes to commit
   saved backup bundle to $TESTTMP/case2/.hg/strip-backup/76abc1c6f8c7-cd698d13-rebase.hg
   $ hg tglog
   o  3: 117b0ed08075 'b1' x
   |
   | o  2: c062e3ecd6c6 'c1' c
   | |
   @ |  1: 792845bb77ee 'b2' b
   |/
--- a/tests/test-rebase-newancestor.t
+++ b/tests/test-rebase-newancestor.t
@@ -125,17 +125,17 @@ wrong.
   $ hg clone -qU . ../ancestor-merge-2
 
 Full rebase all the way back from branching point:
 
   $ hg rebase -r 'only(dev,default)' -d default --config ui.interactive=True << EOF
   > c
   > EOF
   rebasing 1:1d1a643d390e "dev: create branch"
-  note: rebase of 1:1d1a643d390e created no changes to commit
+  note: rebase of 1:1d1a643d390e "dev: create branch" created no changes to commit
   rebasing 2:ec2c14fb2984 "dev: f-dev stuff"
   rebasing 4:4b019212aaf6 "dev: merge default"
   file 'f-default' was deleted in local [dest] but was modified in other [source].
   What do you want to do?
   use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
   rebasing 6:9455ee510502 "dev: merge default"
   saved backup bundle to $TESTTMP/ancestor-merge/.hg/strip-backup/1d1a643d390e-43e9e04b-rebase.hg
   $ hg tglog
--- a/tests/test-rebase-obsolete.t
+++ b/tests/test-rebase-obsolete.t
@@ -124,20 +124,20 @@ empty changeset
 We make a copy of both the first changeset in the rebased and some other in the
 set.
 
   $ hg graft 42ccdea3bb16 32af7686d403
   grafting 1:42ccdea3bb16 "B"
   grafting 3:32af7686d403 "D"
   $ hg rebase  -s 42ccdea3bb16 -d .
   rebasing 1:42ccdea3bb16 "B"
-  note: rebase of 1:42ccdea3bb16 created no changes to commit
+  note: rebase of 1:42ccdea3bb16 "B" created no changes to commit
   rebasing 2:5fddd98957c8 "C"
   rebasing 3:32af7686d403 "D"
-  note: rebase of 3:32af7686d403 created no changes to commit
+  note: rebase of 3:32af7686d403 "D" created no changes to commit
   $ hg log -G
   o  10:5ae4c968c6ac C
   |
   @  9:08483444fef9 D
   |
   o  8:8877864f1edb B
   |
   | o  7:02de42196ebe H
@@ -1451,17 +1451,17 @@ Rebase merge where successor of one pare
   >   A
   > EOF
   1 new orphan changesets
 
   $ hg rebase -d C -b F
   rebasing 2:b18e25de2cf5 "D" (D)
   note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B" (B)
   rebasing 5:66f1a38021c9 "F" (F tip)
-  note: rebase of 5:66f1a38021c9 created no changes to commit
+  note: rebase of 5:66f1a38021c9 "F" (F tip) created no changes to commit
   $ hg log -G
   o  6:8f47515dda15 D
   |
   | x    5:66f1a38021c9 F (pruned using rebase)
   | |\
   o | |  4:26805aba1e60 C
   | | |
   | | x  3:7fb047a69f22 E (rewritten using replace as 1:112478962961)
@@ -1487,17 +1487,17 @@ Rebase merge where successor of other pa
   >   A
   > EOF
   1 new orphan changesets
 
   $ hg rebase -d C -b F
   note: not rebasing 2:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B" (B)
   rebasing 3:7fb047a69f22 "E" (E)
   rebasing 5:66f1a38021c9 "F" (F tip)
-  note: rebase of 5:66f1a38021c9 created no changes to commit
+  note: rebase of 5:66f1a38021c9 "F" (F tip) created no changes to commit
 
   $ hg log -G
   o  6:533690786a86 E
   |
   | x    5:66f1a38021c9 F (pruned using rebase)
   | |\
   o | |  4:26805aba1e60 C
   | | |
--- a/tests/test-rebase-parameters.t
+++ b/tests/test-rebase-parameters.t
@@ -435,17 +435,17 @@ Test --tool parameter:
 
   $ cd ..
 
   $ hg clone -q -u . b b1
   $ cd b1
 
   $ hg rebase -s 2 -d 1 --tool internal:local
   rebasing 2:e4e3f3546619 "c2b" (tip)
-  note: rebase of 2:e4e3f3546619 created no changes to commit
+  note: rebase of 2:e4e3f3546619 "c2b" (tip) created no changes to commit
   saved backup bundle to $TESTTMP/b1/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg
 
   $ hg cat c2
   c2
 
   $ cd ..
 
 
@@ -488,17 +488,17 @@ Test --tool parameter:
   (no more unresolved files)
   continue: hg rebase --continue
   $ hg graft --continue
   abort: no graft in progress
   (continue: hg rebase --continue)
   [255]
   $ hg rebase -c --tool internal:fail
   rebasing 2:e4e3f3546619 "c2b" (tip)
-  note: rebase of 2:e4e3f3546619 created no changes to commit
+  note: rebase of 2:e4e3f3546619 "c2b" (tip) created no changes to commit
   saved backup bundle to $TESTTMP/b3/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg
 
   $ hg rebase -i
   abort: interactive history editing is supported by the 'histedit' extension (see "hg --config extensions.histedit= help -e histedit")
   [255]
 
   $ hg rebase --interactive
   abort: interactive history editing is supported by the 'histedit' extension (see "hg --config extensions.histedit= help -e histedit")
--- a/tests/test-rebase-scenario-global.t
+++ b/tests/test-rebase-scenario-global.t
@@ -133,17 +133,17 @@ if they have the same contents)
   $ hg clone -q -u . a a3
   $ cd a3
   $ hg cat -r 4 E | tee E
   E
 
   $ hg rebase -s 4 -d 7
   rebasing 4:9520eea781bc "E"
   rebasing 6:eea13746799a "G"
-  note: rebase of 6:eea13746799a created no changes to commit
+  note: rebase of 6:eea13746799a "G" created no changes to commit
   saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-fcd8edd4-rebase.hg
   $ f E.orig
   E.orig: file not found
 
   $ hg tglog
   o  6: 9f8b8ec77260 'E'
   |
   @  5: 02de42196ebe 'H'
@@ -164,17 +164,17 @@ if they have the same contents)
 F onto E - rebase of a branching point (skip G):
 
   $ hg clone -q -u . a a4
   $ cd a4
 
   $ hg rebase -s 5 -d 4
   rebasing 5:24b6387c8c8c "F"
   rebasing 6:eea13746799a "G"
-  note: rebase of 6:eea13746799a created no changes to commit
+  note: rebase of 6:eea13746799a "G" created no changes to commit
   rebasing 7:02de42196ebe "H" (tip)
   saved backup bundle to $TESTTMP/a4/.hg/strip-backup/24b6387c8c8c-c3fe765d-rebase.hg
 
   $ hg tglog
   @  6: e9240aeaa6ad 'H'
   |
   o  5: 5d0ccadb6e3e 'F'
   |
--- a/tests/test-remotefilelog-linknodes.t
+++ b/tests/test-remotefilelog-linknodes.t
@@ -82,17 +82,17 @@
   $ echo x >> x
   $ hg commit -Aqm xx2
   $ echo y >> x
   $ hg commit -Aqm xxy
 
   $ hg pull -q
   $ hg rebase -d tip
   rebasing 1:4549721d828f "xx2"
-  note: rebase of 1:4549721d828f created no changes to commit
+  note: rebase of 1:4549721d828f "xx2" created no changes to commit
   rebasing 2:5ef6d97e851c "xxy"
   saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/4549721d828f-b084e33c-rebase.hg (glob)
   $ hg log -f x --template '{node|short}\n'
   4ae8e31c85ef
   0632994590a8
   b292c1e3311f
 
   $ cd ..