sapling/hgext3rd
Mark Thomas 7098f7d4b5 pushrebase: check sources of renames when looking for conflicts
When checking the bundle contents against the revisions it is being rebased
over, include the sources of renames, as changes made in those files also
conflict with the bundle.

Differential Revision: https://phab.mercurial-scm.org/D1199
2017-10-26 02:47:39 -07:00
..
absorb configs: register more of our configs 2017-10-23 20:02:57 -07:00
fastannotate fastannotate: be compatible with upstream change 2017-10-05 10:44:08 -07:00
fbamend configs: register more of our configs 2017-10-23 20:02:57 -07:00
lfs Linting fixes, remove usused import and safehasattr 2017-09-21 08:07:09 -07:00
p4fastimport p4fastimporter: optimize sync import - do not write dup filelogs 2017-10-11 17:49:48 -07:00
__init__.py debian: Do not package hgext3rd/__init__.py 2016-12-19 16:34:49 -08:00
age.py age: add age revsetpredicate extension 2017-08-01 03:12:04 -07:00
arcdiff.py arcdiff: use absolute paths 2017-01-20 00:24:45 -08:00
backups.py commands: update to use registrar instead of cmdutil 2017-05-22 13:38:37 -07:00
bundle2hooks.py compat: add empty placeholder extensions 2017-08-23 14:33:56 -07:00
catnotate.py commands: update to use registrar instead of cmdutil 2017-05-22 13:38:37 -07:00
checkmessagehook.py checkmessagehook: use reposetup to setup a hook 2017-03-02 01:05:19 -08:00
chistedit.py chistedit: fix lint error 2017-05-23 15:38:09 -07:00
cleanobsstore.py cleanobsstore: fix devel-warning 2017-07-17 04:02:43 -07:00
commitextras.py compat: add empty placeholder extensions 2017-08-23 14:33:56 -07:00
configwarn.py configwarn: new extension to warn about unsupported configs 2017-08-07 13:16:09 -07:00
conflictinfo.py conflictinfo: add more information about the conflict-causing command 2017-10-25 22:20:32 -07:00
copytrace.py copytrace: update _filemerge signature, add wctx 2017-09-13 14:24:49 -07:00
crdump.py crdump: fix the binary file dumping on windows 2017-10-25 13:59:24 -07:00
debugcommitmessage.py debugcommitmessage: fix tests 2017-06-19 03:01:18 -07:00
debuginhibit.py inhibit: update existing code to work with the rewritten version 2017-07-10 15:45:31 -07:00
dialect.py testedwith: change testedwith to "ships-with-fb-hgext" 2016-11-29 13:24:07 +00:00
directaccess.py configs: register more of our configs 2017-10-23 20:02:57 -07:00
dirsync.py dirsync: respect rule order 2017-09-21 15:57:11 -07:00
drop.py drop: don't pass rev number to cleanupnodes 2017-10-04 18:47:11 -07:00
edrecord.py edrecord: workaround configitem devel-warn 2017-10-17 13:05:18 -07:00
errorredirect.py errorredirect: modify errorredirect extension to send crash log to scuba table 2017-06-27 09:44:29 -07:00
extorder.py configs: register more of our configs 2017-10-23 20:02:57 -07:00
extutil.py codemod: use pycompat.is* to check platforms 2017-10-17 13:05:18 -07:00
fastlog.py fastlog: use ui.log() instead of ui.warn() 2017-08-22 01:23:25 -07:00
fastpartialmatch.py fastpartialmatch: fix devel.warn 2017-07-17 04:03:15 -07:00
fbconduit.py fbconduit: add timeout 2017-09-21 07:01:27 -07:00
fbhistedit.py configs: register more of our configs 2017-10-23 20:02:57 -07:00
fbshow.py hg show --stat should not show patch 2017-10-16 02:07:53 -07:00
fbsparse.py fbsparse: reapply D1050 to the renamed file 2017-10-16 17:53:16 -07:00
fixcorrupt.py codemod: rewrite nested with 2017-07-17 12:02:08 -07:00
generic_bisect.py fastpartialmatch: use bisect to quickly find matching revisions 2017-02-02 05:12:10 -08:00
githelp.py githelp: don't crash when user does githelp -- git 2017-07-26 08:51:21 -07:00
gitlookup.py gitlookup: reorganising the imports 2017-09-13 17:17:55 -07:00
gitrevset.py gitrevset: add a missing import keyword 2017-08-31 08:27:03 -07:00
grepdiff.py grepdiff: fix to match upstream 2017-03-12 12:49:18 -07:00
grpcheck.py configs: register more of our configs 2017-10-23 20:02:57 -07:00
hiddenerror.py hiddenerror: fix out of bounds error 2017-02-25 15:26:19 -08:00
inhibit.py fbamend: precursor -> predecessor 2017-08-18 03:11:29 -07:00
inhibitwarn.py inhibitwarn: temporarily add the extension back 2017-06-26 11:08:30 -07:00
interactiveui.py interactiveui: disable line wrapping 2017-08-24 12:59:28 -07:00
linkrevcache.py commands: update to use registrar instead of cmdutil 2017-05-22 13:38:37 -07:00
logginghelper.py configs: register more of our configs 2017-10-23 20:02:57 -07:00
mergedriver.py mergedriver: move state writing into wlock 2017-07-17 04:02:43 -07:00
morecolors.py morecolors: colorize uncaught exceptions 2017-06-29 09:55:25 -07:00
morestatus.py configs: register more of our configs 2017-10-23 20:02:57 -07:00
myparent.py templates: fix help messages for template keywords 2017-01-19 12:52:54 -08:00
nointerrupt.py nointerrupt: allowing attendance to default to True 2017-04-24 10:00:31 -07:00
obsshelve.py obsshelve: register maxbackups config 2017-10-16 01:58:29 -07:00
ownercheck.py ownercheck: new extension to prevent operations on repos not owned 2016-07-26 13:10:15 +01:00
patchpython.py patchpython: fix test-check tests 2016-10-20 16:03:31 +01:00
patchrmdir.pyx patchrmdir: new extension to workaround rmdir kernel issues 2017-03-15 18:55:48 -07:00
perftweaks.py perftweaks: fix a bad merge 2017-10-04 18:06:45 -07:00
phabdiff.py phabdiff: add singlepublicbase revset 2017-06-21 17:03:50 +01:00
phabstatus.py phabricator: pass in the cacerts file if configured 2017-10-19 14:03:48 +01:00
phrevset.py configs: register more of our configs 2017-10-23 20:02:57 -07:00
progressfile.py progressfile: write regardless of HGPLAIN setting 2017-08-09 13:59:58 -07:00
pullcreatemarkers.py codemod: rewrite nested with 2017-07-17 12:02:08 -07:00
pushrebase.py pushrebase: check sources of renames when looking for conflicts 2017-10-26 02:47:39 -07:00
pushvars.py pushvars: cleanup the extension to just set the server config option 2017-08-23 09:28:07 +05:30
rage.py phabricator: pass in the cacerts file if configured 2017-10-19 14:03:48 +01:00
remoteid.py remoteid: move to hgext3rd 2017-05-23 11:47:04 -07:00
reset.py bookmarks: use new applychanges api in all extensions 2017-07-18 10:09:28 -07:00
sampling.py configs: register more of our configs 2017-10-23 20:02:57 -07:00
sigtrace.py configs: register more of our configs 2017-10-23 20:02:57 -07:00
simplecache.py testedwith: change testedwith to "ships-with-fb-hgext" 2016-11-29 13:24:07 +00:00
smartlog.py smartlog: fix wrapping of _show 2017-10-23 19:31:43 -07:00
sparse.py sparse: fix for upstreamed path conflicts changes 2017-10-13 06:59:27 -07:00
sshaskpass.py sshaskpass: do not import mercurial 2017-01-05 17:04:34 +00:00
stat.py stat: template which outputs diffstat-style summary of changes 2017-07-31 11:09:50 -07:00
traceprof.pyx traceprof: report profile data even on error 2017-08-14 18:12:29 -07:00
traceprofimpl.cpp traceprof: store raw Python code object 2017-05-23 11:51:10 -07:00
tweakdefaults.py configs: remove config defaults for registered configs 2017-10-24 17:54:02 -07:00
undo.py configs: register more of our configs 2017-10-23 20:02:57 -07:00
upgradegeneraldelta.py upgradegeneraldelta: update to work with upstream revlog changes 2017-07-20 19:48:21 -07:00
whereami.py commands: update to use registrar instead of cmdutil 2017-05-22 13:38:37 -07:00