This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8307

phabricator: account for `basectx != ctx` when calculating renames
ClosedPublic

Authored by mharbison72 on Mar 20 2020, 5:23 PM.

Details

Reviewers
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHG022bf71515c9: phabricator: account for `basectx != ctx` when calculating renames
Summary

No functional changes here because the two are the currently same, but they
won't be with a --fold option.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

PathPackages
Mhgext/phabricator.py (17 lines)

Diff 20847

hgext/phabricator.py

from mercurial.node import bin, nullid from mercurial.node import bin, nullid
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial.pycompat import getattr from mercurial.pycompat import getattr
from mercurial.thirdparty import attr from mercurial.thirdparty import attr
from mercurial import ( from mercurial import (
cmdutil, cmdutil,
context, context,
copies,
encoding, encoding,
error, error,
exthelper, exthelper,
graphmod, graphmod,
httpconnection as httpconnectionmod, httpconnection as httpconnectionmod,
localrepo, localrepo,
logcmdutil, logcmdutil,
match, match,
def addadded(pdiff, basectx, ctx, added, removed): def addadded(pdiff, basectx, ctx, added, removed):
"""add file adds to the phabdiff, both new files and copies/moves""" """add file adds to the phabdiff, both new files and copies/moves"""
# Keep track of files that've been recorded as moved/copied, so if there are # Keep track of files that've been recorded as moved/copied, so if there are
# additional copies we can mark them (moves get removed from removed) # additional copies we can mark them (moves get removed from removed)
copiedchanges = {} copiedchanges = {}
movedchanges = {} movedchanges = {}
copy = {}
if basectx != ctx:
copy = copies.pathcopies(basectx.p1(), ctx)
for fname in added: for fname in added:
fctx = ctx[fname] fctx = ctx[fname]
oldfctx = None oldfctx = None
pchange = phabchange(currentPath=fname) pchange = phabchange(currentPath=fname)
filemode = gitmode[fctx.flags()] filemode = gitmode[fctx.flags()]
renamed = fctx.renamed()
if copy:
originalfname = copy.get(fname, fname)
else:
originalfname = fname
if fctx.renamed():
originalfname = fctx.renamed()[0]
renamed = fname != originalfname
if renamed: if renamed:
originalfname = renamed[0]
oldfctx = basectx.p1()[originalfname] oldfctx = basectx.p1()[originalfname]
originalmode = gitmode[oldfctx.flags()] originalmode = gitmode[oldfctx.flags()]
pchange.oldPath = originalfname pchange.oldPath = originalfname
if originalfname in removed: if originalfname in removed:
origpchange = phabchange( origpchange = phabchange(
currentPath=originalfname, currentPath=originalfname,
oldPath=originalfname, oldPath=originalfname,