# HG changeset patch # User Ian Moody # Date 1570378886 -3600 # Node ID d5d1edf6609104b4d08b0838dfb80dd734b705bb # Parent 675c776fbcd169d62c5422710792edca9fa9f263 phabricator: add addadded function This is the most complicated part of the new code, and is responsible for adding all added files, whether brand new, copied, or moved. This also includes creating the phabchanges for the original files that have been moved or copied from, since they might need their awayPaths and type updating if multiple copies are involved. Differential Revision: https://phab.mercurial-scm.org/D7050 diff -r 675c776fbcd1 -r d5d1edf66091 hgext/phabricator.py --- a/hgext/phabricator.py Wed Oct 02 17:53:47 2019 -0400 +++ b/hgext/phabricator.py Sun Oct 06 17:21:26 2019 +0100 @@ -722,6 +722,71 @@ pdiff.addchange(pchange) +def addadded(pdiff, ctx, added, removed): + """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 + # additional copies we can mark them (moves get removed from removed) + copiedchanges = {} + movedchanges = {} + for fname in added: + fctx = ctx[fname] + pchange = phabchange(currentPath=fname) + + filemode = gitmode[ctx[fname].flags()] + renamed = fctx.renamed() + + if renamed: + originalfname = renamed[0] + originalmode = gitmode[ctx.p1()[originalfname].flags()] + pchange.oldPath = originalfname + + if originalfname in removed: + origpchange = phabchange( + currentPath=originalfname, + oldPath=originalfname, + type=DiffChangeType.MOVE_AWAY, + awayPaths=[fname], + ) + movedchanges[originalfname] = origpchange + removed.remove(originalfname) + pchange.type = DiffChangeType.MOVE_HERE + elif originalfname in movedchanges: + movedchanges[originalfname].type = DiffChangeType.MULTICOPY + movedchanges[originalfname].awayPaths.append(fname) + pchange.type = DiffChangeType.COPY_HERE + else: # pure copy + if originalfname not in copiedchanges: + origpchange = phabchange( + currentPath=originalfname, type=DiffChangeType.COPY_AWAY + ) + copiedchanges[originalfname] = origpchange + else: + origpchange = copiedchanges[originalfname] + origpchange.awayPaths.append(fname) + pchange.type = DiffChangeType.COPY_HERE + + if filemode != originalmode: + pchange.addoldmode(originalmode) + pchange.addnewmode(filemode) + else: # Brand-new file + pchange.addnewmode(gitmode[fctx.flags()]) + pchange.type = DiffChangeType.ADD + + if fctx.isbinary(): + makebinary(pchange, fctx) + if renamed: + addoldbinary(pchange, fctx, originalfname) + else: + maketext(pchange, ctx, fname) + + pdiff.addchange(pchange) + + for _path, copiedchange in copiedchanges.items(): + pdiff.addchange(copiedchange) + for _path, movedchange in movedchanges.items(): + pdiff.addchange(movedchange) + + def creatediff(ctx): """create a Differential Diff""" repo = ctx.repo()