This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6358

overlaycontext: allow calling copydata() on clean context
ClosedPublic

Authored by martinvonz on May 10 2019, 5:02 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGcdcebc897529: overlaycontext: allow calling copydata() on clean context
Summary

We should just report no copy if the context is clean.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.May 10 2019, 5:02 PM
martinvonz retitled this revision from overlaycontext: allow calling copydata() one clean context to overlaycontext: allow calling copydata() on clean context.May 11 2019, 2:30 AM
Closed by commit rHGcdcebc897529: overlaycontext: allow calling copydata() on clean context (authored by martinvonz). · Explain WhyMay 15 2019, 2:02 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (2 lines)
Mtests/test-rebase-inmemory.t (10 lines)

Diff 15051

mercurial/context.py

def markcopied(self, path, origin): def markcopied(self, path, origin):
self._markdirty(path, exists=True, date=self.filedate(path), self._markdirty(path, exists=True, date=self.filedate(path),
flags=self.flags(path), copied=origin) flags=self.flags(path), copied=origin)
def copydata(self, path): def copydata(self, path):
if self.isdirty(path): if self.isdirty(path):
return self._cache[path]['copied'] return self._cache[path]['copied']
else: else:
raise error.ProgrammingError('copydata() called on clean context') return None
def flags(self, path): def flags(self, path):
if self.isdirty(path): if self.isdirty(path):
if self._cache[path]['exists']: if self._cache[path]['exists']:
return self._cache[path]['flags'] return self._cache[path]['flags']
else: else:
raise error.ProgrammingError("No such file or directory: %s" % raise error.ProgrammingError("No such file or directory: %s" %
self._path) self._path)

tests/test-rebase-inmemory.t

$ cd rebase-rename $ cd rebase-rename
$ echo a > a $ echo a > a
$ hg ci -Aqm 'add a' $ hg ci -Aqm 'add a'
$ echo a2 > a $ echo a2 > a
$ hg ci -m 'modify a' $ hg ci -m 'modify a'
$ hg co -q 0 $ hg co -q 0
$ hg mv a b $ hg mv a b
$ hg ci -qm 'rename a to b' $ hg ci -qm 'rename a to b'
$ hg rebase -d 1 2>&1 | grep '** ProgrammingError' $ hg rebase -d 1
** ProgrammingError: copydata() called on clean context rebasing 2:b977edf6f839 "rename a to b" (tip)
merging a and b to b
saved backup bundle to $TESTTMP/rebase-rename/.hg/strip-backup/b977edf6f839-0864f570-rebase.hg
$ hg st --copies --change .
A b
a
R a
$ cd .. $ cd ..
Test rebasing when the file we are merging in destination is empty Test rebasing when the file we are merging in destination is empty
$ hg init test $ hg init test
$ cd test $ cd test
$ echo a > foo $ echo a > foo
$ hg ci -Aqm 'added a to foo' $ hg ci -Aqm 'added a to foo'