sapling/mercurial
FUJIWARA Katsunori 9edf9953ec destutil: choose non-closed branch head at first (BC)
Before this patch, destupdate() returns the tipmost (descendant)
branch head regardless of closed or not. But updating to closed branch
head isn't reasonable for ordinary workflow, because:

  - "hg heads" doesn't show closed heads (= updated parent itself) by
    default

  - subsequent committing on it re-opens closed branch

    even if inactivation of closed head is needed, update destination
    isn't it, because it should be merged into to another branch in
    such case.

This patch chooses non-closed descendant branch head as default update
destination at first. If all descendant branch heads are closed,
destupdate() returns the tipmost closed branch head.

For simplicity, this patch chooses adding _destupdatebranchfallback()
instead largely changing _destupdatebranch().

This patch changes not only normal lookup code path, but also the "no
default branch" code path, for consistency.
2016-03-07 03:14:19 +09:00
..
default.d mergetools.rc: find OSX FileMerge in the new location inside Xcode 4.3 2015-10-16 11:37:34 +02:00
help doc: correct example concerning "hg purge" alias in man page "hgrc.5" 2016-02-20 17:32:26 +01:00
hgweb hgweb: add option to convert encoding of graphdata() 2016-01-04 23:05:09 +09:00
httpclient httpclient: update to 938f2107d6e2 of httpplus 2015-12-31 13:19:20 -05:00
pure osutil: do not abort loading pure module just because libc has no recvmsg() 2016-02-03 22:47:27 +09:00
templates hgweb: add index template to json/map 2016-02-27 19:53:18 +08:00
__init__.py mercurial: support loading modules from zipimporter 2015-12-03 21:25:05 -08:00
ancestor.py ancestor: use absolute_import 2015-08-07 19:45:48 -07:00
archival.py match: rename "narrowmatcher" to "subdirmatcher" (API) 2016-02-05 21:09:32 -08:00
base85.c base85: fix comparison of an int and a long 2015-08-21 14:29:42 -04:00
bdiff.c bdiff: avoid a memory error on malloc failure 2013-10-30 16:03:42 -05:00
bookmarks.py bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917) 2016-02-19 22:28:09 +01:00
branchmap.py branchmap: check node against changelog instead of repo 2016-03-07 17:26:47 -08:00
bundle2.py changegroup: fix pulling to treemanifest repo from flat repo (issue5066) 2016-01-27 09:07:28 -08:00
bundlerepo.py bundlerepo: properly handle hidden linkrev in manifestlog (issue4945) 2016-02-22 23:34:54 +01:00
byterange.py byterange: use absolute_import 2015-12-21 21:42:14 -08:00
changegroup.py changegroup: clear progress callback after changelog processing 2016-02-29 09:26:43 -08:00
changelog.py changelog: backed out changeset 4ef1c9b76e22 2016-03-02 16:05:30 -06:00
cmdutil.py formatter: make labels work with templated output 2016-03-08 04:08:33 -08:00
commands.py commit: block amend while histedit is in progress (issue4800) 2016-02-14 07:35:50 +00:00
commandserver.py commandserver: use _readlist 2016-02-15 14:20:41 +00:00
config.py config: add hasconfig method and supporting plumbing 2016-01-07 19:45:03 -08:00
context.py changelog: backed out changeset 4ef1c9b76e22 2016-03-02 16:05:30 -06:00
copies.py copies: optimize forward copy detection logic for rebases 2016-02-05 13:23:24 -08:00
crecord.py crecord: fix help bar display issue (issue5063) 2016-01-25 11:37:02 -08:00
dagparser.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
dagutil.py dagutil: use absolute_import 2015-08-08 19:04:09 -07:00
demandimport.py demandimport: add _imp to ignore list 2016-02-25 22:35:11 -08:00
destutil.py destutil: choose non-closed branch head at first (BC) 2016-03-07 03:14:19 +09:00
diffhelpers.c diffhelpers: fix botched return statement from e48d70075d8a 2015-01-28 13:34:20 -05:00
dirs.c dirs._addpath: reinstate use of Py_CLEAR 2015-04-07 20:43:04 -07:00
dirstate.py dirstate: add a way to get the ignore file/line matching an ignored file 2016-01-05 07:52:04 -08:00
discovery.py bookmarks: don't allow pushing new head for existing mark with -B (issue4400) 2015-10-21 16:21:27 -05:00
dispatch.py dispatch: add wd parameter to _getlocal 2016-02-26 15:07:58 +00:00
dummycert.pem ssl: on OS X, use a dummy cert to trick Python/OpenSSL to use system CA certs 2014-09-26 02:19:48 +02:00
encoding.py encoding: backport paranoid escaping from templatefilters.jsonescape() 2015-12-27 19:58:11 +09:00
error.py destutil: add more precise error classes for destmerge 2016-02-09 23:30:41 +00:00
exchange.py changegroup: fix pulling to treemanifest repo from flat repo (issue5066) 2016-01-27 09:07:28 -08:00
exewrapper.c exewrapper: add comments about PYTHONHOME 2015-10-14 12:23:49 +02:00
extensions.py extensions: copy extra __dict__ of original function 2016-01-09 20:04:03 +09:00
fancyopts.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
filelog.py filelog: use absolute_import 2015-08-08 19:11:42 -07:00
filemerge.py origpath: move from cmdutil to scmutil 2016-01-02 03:02:57 -08:00
fileset.py fileset: fix copy/paste in eol() error message 2016-02-18 22:32:18 -05:00
formatter.py formatter: make labels work with templated output 2016-03-08 04:08:33 -08:00
graphmod.py graphmod: augment the graph to include more information about the edges 2016-03-04 14:44:32 +00:00
hbisect.py with: use context manager in bisect save_state 2016-01-15 13:14:49 -08:00
help.py help: don't crash in keyword search if an extension fails to provide docs 2016-02-10 01:48:58 -08:00
hg.py merge with stable 2016-03-02 16:44:56 -06:00
hook.py hook: don't crash on syntax errors in python hooks 2016-02-12 14:50:10 -08:00
httpconnection.py httpconnection: use absolute_import 2015-12-21 21:52:58 -08:00
httppeer.py cleanup: remove superfluous space after space after equals (python) 2015-12-31 08:16:59 +00:00
i18n.py i18n: use absolute_import 2015-08-08 19:28:49 -07:00
keepalive.py keepalive: remove useless parentheses around exception type 2016-02-28 00:00:13 -08:00
localrepo.py localrepo: support background closing for wwrite() 2016-02-20 15:25:27 -08:00
lock.py util: enable getpid to be replaced 2016-02-03 09:11:22 +00:00
lsprof.py lsprof: use print function 2016-01-02 11:40:53 -08:00
lsprofcalltree.py lsprofcalltree: use print function 2016-01-02 11:45:29 -08:00
mail.py patch: when importing from email, RFC2047-decode From/Subject headers 2016-03-03 18:34:19 +01:00
manifest.c lazymanifest: check more return values in filtercopy 2015-12-31 13:31:42 -05:00
manifest.py changegroup: fix treemanifests on merges 2016-02-12 23:09:09 -08:00
match.py match: override 'visitdir' in subdirmatcher 2016-02-05 21:25:44 -08:00
mdiff.py mdiff: don't emit a diff header for empty trivial deltas 2016-01-11 22:00:07 -05:00
merge.py merge: fix error message 2016-02-26 19:13:10 +00:00
minirst.py minirst: change hgrole to use single quotes 2016-01-12 06:03:36 +00:00
mpatch.c mpatch: rewrite pointer overflow checks 2013-12-11 18:33:42 -06:00
namespaces.py namespaces: use absolute_import 2015-08-08 19:42:58 -07:00
node.py node: add 'nullhex', hex-encoded nullid 2015-11-16 11:23:32 -08:00
obsolete.py obsolete: fix n^2 marker computation behavior 2016-02-04 15:38:04 -08:00
osutil.c osutil: disable compilation of recvfds() on unsupported platforms 2016-02-02 20:56:48 +09:00
parser.py parser: move unescape helper from templater 2015-09-10 23:25:10 +09:00
parsers.c cleanup: remove superfluous space after space after equals (C) 2015-12-31 08:17:15 +00:00
patch.py patch: when importing from email, RFC2047-decode From/Subject headers 2016-03-03 18:34:19 +01:00
pathencode.c pathencode: check result of .digest() method in sha1hash 2015-08-18 16:32:41 -04:00
pathutil.py pathauditor: change parts verification order to be root first 2016-02-11 17:04:33 -08:00
peer.py peer: use absolute_import 2015-08-08 19:45:45 -07:00
phases.py phases: use constants for phase values 2016-02-15 16:49:52 -08:00
posix.py posix: fix test-permissions regression 2015-11-09 15:53:11 -06:00
progress.py progress: display progress bar when HGPLAINEXCEPT contains "progress" 2016-02-17 15:18:30 -08:00
pushkey.py pushkey: use absolute_import 2015-08-08 19:57:27 -07:00
pvec.py pvec: use absolute_import 2015-12-21 21:32:58 -08:00
py3kcompat.py py3compat: use absolute_import 2015-12-21 21:31:57 -08:00
registrar.py registrar: add delayregistrar class to register function in extensions 2015-12-29 23:58:30 +09:00
repair.py treemanifest: fix debugrebuildfncache 2016-02-07 21:44:38 -08:00
repoview.py repoview: discard filtered changelog if index isn't shared with unfiltered 2016-02-24 06:10:46 +09:00
revlog.py revlog: fix bad indentation (replace tab by space) 2015-12-18 20:54:41 -08:00
revset.py revset: flatten chained 'list' operations (aka function args) (issue5072) 2016-02-02 23:49:49 +09:00
scmposix.py scmposix: use absolute_import 2015-12-21 21:24:49 -08:00
scmutil.py scmutil: support background closing for write() 2016-02-20 15:24:12 -08:00
scmwindows.py windows: read all global config files, not just the first (issue4491) (BC) 2015-10-12 20:13:12 +02:00
setdiscovery.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
similar.py similar: use absolute_import 2015-12-12 23:17:22 -08:00
simplemerge.py merge: minimize conflicts when common base is not shown (issue4447) 2016-02-10 09:06:08 -08:00
sshpeer.py sshpeer: make remotelock a context manager 2016-01-15 13:14:50 -08:00
sshserver.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
sslutil.py sslutil: fix reversed logic (issue5034) 2016-01-08 16:27:25 +01:00
statichttprepo.py statichttprepo: implement __enter__ and __exit__ on httprangeheader 2016-01-02 15:33:01 -08:00
store.py treemanifests: fix streaming clone 2016-02-04 08:34:07 -08:00
streamclone.py streamclone: use backgroundfilecloser (issue4889) 2016-01-14 13:44:01 -08:00
strutil.py strutil: use absolute_import 2015-08-08 20:01:40 -07:00
subrepo.py match: rename "narrowmatcher" to "subdirmatcher" (API) 2016-02-05 21:09:32 -08:00
tagmerge.py tagmerge: use absolute_import 2015-08-08 20:10:46 -07:00
tags.py tags: create new sortdict for performance reasons 2015-11-12 13:16:04 -08:00
templatefilters.py templatefilters: drop old jsonescape() function 2015-12-27 18:50:03 +09:00
templatekw.py templatekw: switch ctx of list expression to rev of {parents} (BC) 2016-02-12 19:16:09 +09:00
templater.py formatter: make labels work with templated output 2016-03-08 04:08:33 -08:00
transaction.py transaction: abort transaction during hook exception 2016-01-19 15:18:21 -08:00
treediscovery.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
ui.py ui: fix crash by non-interactive prompt echo for user name 2016-02-06 20:43:20 +09:00
unionrepo.py unionrepo: properly handle hidden linkrev in revlog (issue5070) 2016-02-22 23:36:04 +01:00
url.py url: drop support for python2.5 2015-10-15 17:21:08 -04:00
util.h util: fix the check for non-C99 compilers (issue4605) 2015-04-20 22:21:57 -05:00
util.py util: enable getpid to be replaced 2016-02-03 09:11:22 +00:00
verify.py verify: recover lost freeing of memory 2016-01-31 00:31:55 -08:00
win32.py win32: use absolute_import 2015-08-08 18:52:59 -07:00
windows.py windows: insert file positioning call between reads and writes 2015-09-27 18:46:53 -07:00
wireproto.py wireproto: support disabling bundle1 only if repo is generaldelta 2015-12-20 11:56:24 -08:00
worker.py worker: document poor partitioning scheme impact 2016-02-27 21:43:17 -08:00