This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6375

commit: fix a typo ("form p1" -> "from p1")
ClosedPublic

Authored by martinvonz on May 15 2019, 12:22 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG8988e640a8ac: commit: fix a typo ("form p1" -> "from p1")

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.May 15 2019, 12:22 AM
pulkit accepted this revision.May 15 2019, 1:22 PM
pulkit added a comment.May 15 2019, 1:32 PM

Amending the following diff in flight:

diff --git a/tests/test-graft.t b/tests/test-graft.t
--- a/tests/test-graft.t
+++ b/tests/test-graft.t
@@ -755,7 +755,7 @@ Transplants of grafts can find a destina
   committing files:
   b
   warning: can't find ancestor for 'b' copied from 'a'!
-  reusing manifest form p1 (listed files actually unchanged)
+  reusing manifest from p1 (listed files actually unchanged)
   committing changelog
   updating the branch cache
   $ hg log -r 'destination(13)'
Closed by commit rHG8988e640a8ac: commit: fix a typo ("form p1" -> "from p1") (authored by martinvonz). · Explain WhyMay 15 2019, 1:34 PM
This revision was automatically updated to reflect the committed changes.
martinvonz added a comment.May 15 2019, 1:35 PM
In D6375#92739, @pulkit wrote:

Amending the following diff in flight:

diff --git a/tests/test-graft.t b/tests/test-graft.t
--- a/tests/test-graft.t
+++ b/tests/test-graft.t
@@ -755,7 +755,7 @@ Transplants of grafts can find a destina
   committing files:
   b
   warning: can't find ancestor for 'b' copied from 'a'!
-  reusing manifest form p1 (listed files actually unchanged)
+  reusing manifest from p1 (listed files actually unchanged)
   committing changelog
   updating the branch cache
   $ hg log -r 'destination(13)'

Thanks! (and sorry I didn't notice that)

Revision Contents
Changeset List

Diff 15085

mercurial/localrepo.py

# one case where we might have files outside the narrowspec # one case where we might have files outside the narrowspec
# at this point is merges, and we already error out in the # at this point is merges, and we already error out in the
# case where the merge has files outside of the narrowspec, # case where the merge has files outside of the narrowspec,
# so this is safe. # so this is safe.
mn = mctx.write(trp, linkrev, mn = mctx.write(trp, linkrev,
p1.manifestnode(), p2.manifestnode(), p1.manifestnode(), p2.manifestnode(),
added, drop, match=self.narrowmatch()) added, drop, match=self.narrowmatch())
else: else:
self.ui.debug('reusing manifest form p1 (listed files ' self.ui.debug('reusing manifest from p1 (listed files '
'actually unchanged)\n') 'actually unchanged)\n')
mn = p1.manifestnode() mn = p1.manifestnode()
else: else:
self.ui.debug('reusing manifest from p1 (no file change)\n') self.ui.debug('reusing manifest from p1 (no file change)\n')
mn = p1.manifestnode() mn = p1.manifestnode()
files = [] files = []
if writecopiesto == 'changeset-only': if writecopiesto == 'changeset-only':

tests/test-merge-no-file-change.t

$ hg merge $ hg merge
warning: cannot merge flags for b without common ancestor - keeping local flags warning: cannot merge flags for b without common ancestor - keeping local flags
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ chmod +x b $ chmod +x b
$ hg ci --debug -m merge $ hg ci --debug -m merge
committing files: committing files:
b b
reusing manifest form p1 (listed files actually unchanged) reusing manifest from p1 (listed files actually unchanged)
committing changelog committing changelog
updating the branch cache updating the branch cache
committed changeset 3:c8d50407916ef8a5a97cb6e36ca9bc844a6ee13e committed changeset 3:c8d50407916ef8a5a97cb6e36ca9bc844a6ee13e
$ hg log -GTl $ hg log -GTl
@ 3:c8d50407916e p=2,1 m=2:36b69ba4b24b f=[] @ 3:c8d50407916e p=2,1 m=2:36b69ba4b24b f=[]
|\ |\
| o 2:99451f16b3f5 p=0,-1 m=2:36b69ba4b24b f=["b"] | o 2:99451f16b3f5 p=0,-1 m=2:36b69ba4b24b f=["b"]
| | | |