This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6570

rebase: fix in-memory rebasing of copy of empty file
ClosedPublic

Authored by martinvonz on Jun 24 2019, 7:11 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGe079e001d536: rebase: fix in-memory rebasing of copy of empty file
Summary

Classic Python mistake of unintentionally treating None and empty
string the same.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Jun 24 2019, 7:11 PM
pulkit accepted this revision.Jun 27 2019, 11:47 AM
This revision is now accepted and ready to land.Jun 27 2019, 11:47 AM
martinvonz added a commit: rHGe079e001d536: rebase: fix in-memory rebasing of copy of empty file.Jun 27 2019, 12:20 PM
Closed by commit rHGe079e001d536: rebase: fix in-memory rebasing of copy of empty file (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 15680

mercurial/context.py

def _markdirty(self, path, exists, data=None, date=None, flags='', def _markdirty(self, path, exists, data=None, date=None, flags='',
copied=None): copied=None):
# data not provided, let's see if we already have some; if not, let's # data not provided, let's see if we already have some; if not, let's
# grab it from our underlying context, so that we always have data if # grab it from our underlying context, so that we always have data if
# the file is marked as existing. # the file is marked as existing.
if exists and data is None: if exists and data is None:
oldentry = self._cache.get(path) or {} oldentry = self._cache.get(path) or {}
data = oldentry.get('data') or self._wrappedctx[path].data() data = oldentry.get('data')
if data is None:
data = self._wrappedctx[path].data()
self._cache[path] = { self._cache[path] = {
'exists': exists, 'exists': exists,
'data': data, 'data': data,
'date': date, 'date': date,
'flags': flags, 'flags': flags,
'copied': copied, 'copied': copied,
} }

tests/test-rebase-inmemory.t

$ cd rebase-rename-empty $ cd rebase-rename-empty
$ echo a > a $ echo a > a
$ hg ci -Aqm 'add a' $ hg ci -Aqm 'add a'
$ cat > a $ cat > a
$ hg ci -m 'make a empty' $ hg ci -m 'make a empty'
$ 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'
BROKEN: shouldn't crash
$ hg rebase -d 1 $ hg rebase -d 1
rebasing 2:b977edf6f839 "rename a to b" (tip) rebasing 2:b977edf6f839 "rename a to b" (tip)
merging a and b to b merging a and b to b
abort: b@c71e275f666f: not found in manifest! saved backup bundle to $TESTTMP/rebase-rename-empty/.hg/strip-backup/b977edf6f839-0864f570-rebase.hg
[255]
$ hg st --copies --change . $ hg st --copies --change .
A b A b
a a
R a R a
$ cd .. $ cd ..
Rebase across a copy with --collapse Rebase across a copy with --collapse
$ hg init rebase-rename-collapse $ hg init rebase-rename-collapse