| Mon, 30 Nov 2015 10:05:09 -0800 |
Siddharth Agarwal |
mergestate: raise exception if otherctx is accessed but _other isn't set
|
| Mon, 30 Nov 2015 18:47:33 +0000 |
timeless |
pager: improve help for --pager=
|
| Tue, 24 Nov 2015 21:17:26 -0800 |
Gregory Szorc |
setup: remove unused py_modules argument to setup()
|
| Mon, 23 Nov 2015 13:45:56 -0800 |
Siddharth Agarwal |
test-merge-changedelete.t: add resolve --list output
|
| Mon, 23 Nov 2015 13:43:14 -0800 |
Siddharth Agarwal |
test-merge-changedelete.t: add a file with regular merge conflicts
|
| Tue, 24 Nov 2015 10:58:35 -0800 |
Siddharth Agarwal |
filemerge: in ':prompt', use ':fail' tool rather than returning directly
|
| Tue, 24 Nov 2015 10:57:01 -0800 |
Siddharth Agarwal |
filemerge: in ':fail' tool, write out other side if local side is deleted
|
| Mon, 23 Nov 2015 18:03:25 -0800 |
Siddharth Agarwal |
mergestate: explicitly forget 'dc' conflicts where the deleted side is picked
|
| Mon, 23 Nov 2015 19:06:15 -0800 |
Siddharth Agarwal |
merge.applyupdates: add all actions returned from merge state
|
| Fri, 27 Nov 2015 20:23:23 +0100 |
Mathias De Maré |
identify: refer to log to be able to view full hashes
|
| Fri, 27 Nov 2015 20:23:02 +0100 |
Mathias De Maré |
log: add 'hg log' example for full hashes
|
| Fri, 02 Oct 2015 07:48:23 +0200 |
Mathias De Maré |
backout: add examples to clarify basic usage
|
| Wed, 25 Nov 2015 06:10:54 +0000 |
timeless |
gpg: rename sigcheck function
|
| Tue, 24 Nov 2015 18:40:16 -0500 |
Augie Fackler |
extensions: properly mark progress as part of core
|
| Fri, 27 Nov 2015 23:10:48 +0900 |
Yuya Nishihara |
test-help: don't use progress extension for the test of argument parsing
|
| Tue, 24 Nov 2015 22:31:56 +0000 |
timeless |
hghave.py: fix matchoutput documentation
|
| Tue, 24 Nov 2015 14:23:46 -0800 |
Gregory Szorc |
dispatch: use versiontuple()
|
| Tue, 24 Nov 2015 14:23:51 -0800 |
Gregory Szorc |
util: add versiontuple() for returning parsed version information
|
| Tue, 24 Nov 2015 16:38:54 -0800 |
Bryan O'Sullivan |
extensions: rename _ignore to _builtin, add descriptive comment
|
| Sun, 22 Nov 2015 14:44:55 -0800 |
Gregory Szorc |
ui: avoid needless casting to a str
|
| Tue, 24 Nov 2015 11:23:10 -0800 |
Gregory Szorc |
ui: remove labeled argument from popbuffer
|
| Sun, 22 Nov 2015 14:18:42 -0800 |
Gregory Szorc |
color: evaluate labels at write time
|
| Sun, 22 Nov 2015 14:13:25 -0800 |
Gregory Szorc |
cmdutil: pass labeled=True to pushbuffer()
|
| Sun, 22 Nov 2015 14:10:48 -0800 |
Gregory Szorc |
ui: track label expansion when creating buffers
|
| Tue, 01 Dec 2015 20:18:28 -0600 |
Matt Mackall |
Added signature for changeset 2d437a0f3355
stable
|
| Tue, 01 Dec 2015 20:18:27 -0600 |
Matt Mackall |
Added tag 3.6.2 for changeset 2d437a0f3355
stable
|
| Tue, 24 Nov 2015 18:13:25 -0800 |
Pierre-Yves David |
docker: match more version of 'hg docker version' (issue4967)
stable 3.6.2
|
| Mon, 30 Nov 2015 16:31:28 -0800 |
Siddharth Agarwal |
localrepo.commit: check all files for resolve state (issue4972)
stable
|
| Tue, 24 Nov 2015 21:41:12 +0000 |
timeless |
test-contrib-perf: add smoke tests for perf.py
|
| Tue, 24 Nov 2015 21:36:20 +0000 |
timeless |
contrib/perf: perfparents handle filtered repos
|
| Tue, 24 Nov 2015 20:54:14 +0000 |
timeless |
contrib/perf: perfparents handle tiny repos
|
| Tue, 24 Nov 2015 21:44:16 +0000 |
timeless |
contrib/perf: fix perfmergecalculate
|
| Tue, 24 Nov 2015 22:01:11 +0000 |
timeless |
contrib/perf: fix perffncachewrite
|
| Tue, 24 Nov 2015 20:05:15 +0000 |
timeless |
contrib/perf: omit duplicated function
|
| Tue, 24 Nov 2015 20:08:21 +0000 |
timeless |
contrib/perf: name functions to match decorators
|
| Tue, 24 Nov 2015 22:26:43 +0000 |
timeless |
hghave.py: remove execute bit
|
| Mon, 02 Nov 2015 17:33:18 +0000 |
Pierre-Yves David |
format: create new repository as 'generaldelta' by default
|
| Sun, 22 Nov 2015 21:40:23 -0800 |
Siddharth Agarwal |
shelve: use colon instead of quotes in 'changes to' description
|
| Sun, 22 Nov 2015 21:58:28 -0800 |
Siddharth Agarwal |
merge.applyupdates: create absentfilectxes for change/delete conflicts
|
| Sun, 22 Nov 2015 21:59:52 -0800 |
Siddharth Agarwal |
mergestate: add methods to queue files to remove, add or get
|
| Sun, 15 Nov 2015 21:27:22 -0800 |
Siddharth Agarwal |
resolve: record dirstate actions after performing resolutions
|
| Fri, 20 Nov 2015 16:55:01 -0800 |
Siddharth Agarwal |
mergestate: add a way to record pending dirstate actions
|
| Sun, 15 Nov 2015 21:55:46 -0800 |
Siddharth Agarwal |
merge.recordupdates: don't require action keys to be present in dict
|
| Mon, 23 Nov 2015 10:13:05 -0500 |
Augie Fackler |
histedit: constant-ify the constraints list
|
| Tue, 17 Nov 2015 15:04:31 -0800 |
Mateusz Kwapich |
histedit: add an experimental base action
|
| Tue, 17 Nov 2015 17:53:52 -0800 |
Mateusz Kwapich |
histedit: add abortdirty function
|
| Thu, 12 Nov 2015 16:40:33 -0800 |
Mateusz Kwapich |
histedit: add forceother constraint
|
| Tue, 17 Nov 2015 16:37:26 -0800 |
Mateusz Kwapich |
histedit: make verification configurable
|
| Fri, 13 Nov 2015 18:31:58 +0800 |
Anton Shestakov |
paper: show current revision on file log page
|
| Fri, 20 Nov 2015 11:26:31 -0800 |
Siddharth Agarwal |
merge.applyupdates: extend action queues with ones returned from mergestate
|
| Fri, 20 Nov 2015 16:43:25 -0800 |
Siddharth Agarwal |
mergestate: add a method to compute actions to perform on dirstate
|
| Fri, 20 Nov 2015 16:37:39 -0800 |
Siddharth Agarwal |
merge.applyupdates: use counters from mergestate
|
| Fri, 20 Nov 2015 16:18:51 -0800 |
Siddharth Agarwal |
mergestate: add a function to return the number of unresolved files
|
| Fri, 20 Nov 2015 16:17:54 -0800 |
Siddharth Agarwal |
mergestate: add a method to return updated/merged/removed counts
|
| Fri, 20 Nov 2015 16:32:47 -0800 |
Siddharth Agarwal |
mergestate._resolve: don't return the action any more
|
| Fri, 20 Nov 2015 16:08:22 -0800 |
Siddharth Agarwal |
mergestate._resolve: store return code and action for each file
|
| Sat, 21 Nov 2015 15:43:04 -0800 |
Gregory Szorc |
revsetbenchmarks: support benchmarking changectx loading
|
| Sat, 21 Nov 2015 15:39:18 -0800 |
Gregory Szorc |
perf: support obtaining contexts from perfrevset
|
| Sat, 21 Nov 2015 11:07:30 -0800 |
Gregory Szorc |
localrepo: improve docstring for revset methods
|
| Sun, 22 Nov 2015 16:23:20 -0800 |
Gregory Szorc |
revlog: improve documentation
|
| Sat, 21 Nov 2015 22:28:01 -0800 |
Gregory Szorc |
demandimport: don't enable when running under PyPy
|
| Sat, 14 Nov 2015 17:14:14 -0800 |
Gregory Szorc |
ui.write: don't clear progress bar when writing to a buffer
|
| Sun, 22 Nov 2015 21:20:08 -0500 |
Matt Harbison |
test-resolve: fix '--tool f' invocation for Windows
|
| Sat, 14 Nov 2015 17:30:10 -0800 |
Gregory Szorc |
util.datestr: use divmod()
|
| Sat, 14 Nov 2015 17:44:01 -0800 |
Gregory Szorc |
cmdutil.changeset_printer: pass context into showpatch()
|
| Sat, 21 Nov 2015 19:21:01 -0800 |
Gregory Szorc |
context: avoid extra parents lookups
|
| Sat, 21 Nov 2015 19:04:12 -0800 |
Gregory Szorc |
context: optimize _parents()
|
| Sun, 22 Nov 2015 13:05:21 -0500 |
Matt Harbison |
test-histedit: $TESTTMP quoting fixes for Windows
|
| Sat, 21 Nov 2015 23:26:22 -0800 |
Gregory Szorc |
lsprof: support PyPy (issue4573)
|
| Wed, 11 Nov 2015 19:10:45 -0500 |
Augie Fackler |
base85: clean up function definition style
|
| Fri, 20 Nov 2015 14:06:31 -0800 |
Laurent Charignon |
rebase: use bookmarks.recordchange instead of bookmarks.write
|
| Fri, 20 Nov 2015 11:36:05 -0800 |
Laurent Charignon |
rebase: indentation change to make the next patch more legible
|
| Mon, 16 Nov 2015 16:56:00 -0500 |
Matt Harbison |
test-run-tests: conditionalize the $TESTDIR check for Windows separator
|
| Mon, 09 Nov 2015 17:15:36 -0500 |
Matt Harbison |
test-context: conditionalize the workingfilectx date printing for Windows
|
| Mon, 16 Nov 2015 14:37:03 -0500 |
Matt Harbison |
test-mq-qrefresh: drop single quoting of HGEDITOR value for Windows
|
| Mon, 16 Nov 2015 14:12:27 -0500 |
Matt Harbison |
test-import: don't use printf to append an extension to $HGRCPATH
|
| Mon, 16 Nov 2015 13:44:27 -0500 |
Matt Harbison |
test-ssh: stop quoting dummyssh invocation for Windows
|
| Fri, 20 Nov 2015 13:46:36 -0800 |
Laurent Charignon |
strip: use repo._bookmarks.recordchange instead of repo._bookmarks.write
|
| Fri, 20 Nov 2015 13:23:47 -0800 |
Laurent Charignon |
histedit: make use of bookmarks.recordchange instead of bookmarks.write
|
| Wed, 18 Nov 2015 17:40:13 -0800 |
Siddharth Agarwal |
largefiles: fall back to the original for change/delete conflicts
|
| Sat, 14 Nov 2015 00:07:11 -0800 |
Siddharth Agarwal |
mergestate.add: store absentfilectxes as nullhex
|
| Fri, 20 Nov 2015 01:14:15 -0800 |
Siddharth Agarwal |
mergestate._resolve: handle change/delete conflicts
|
| Sat, 14 Nov 2015 00:00:46 -0800 |
Siddharth Agarwal |
filemerge: don't try to copy files known to be absent
|
| Sat, 31 Oct 2015 22:07:40 +0900 |
Yuya Nishihara |
hgweb: use absolute_import
|
| Sun, 01 Nov 2015 15:09:35 +0900 |
Yuya Nishihara |
hgweb: import wsgicgi at top level
|
| Sun, 01 Nov 2015 15:07:08 +0900 |
Yuya Nishihara |
hgweb: import BaseHTTPServer as module at top level
|
| Sun, 01 Nov 2015 14:23:23 +0900 |
Yuya Nishihara |
hgweb: do not import hgweb_mod.hgweb and .makebreadcrumb as symbol
|
| Fri, 13 Nov 2015 23:57:43 -0800 |
Siddharth Agarwal |
filemerge: don't try using external tools on change/delete conflicts
|
| Fri, 13 Nov 2015 23:56:00 -0800 |
Siddharth Agarwal |
filemerge: don't attempt to premerge change/delete conflicts
|
| Fri, 13 Nov 2015 23:58:05 -0800 |
Siddharth Agarwal |
filemerge._mergecheck: add check for change/delete conflicts
|
| Sun, 15 Nov 2015 21:40:15 -0800 |
Siddharth Agarwal |
filemerge._picktool: only pick from nomerge tools for change/delete conflicts
|
| Fri, 13 Nov 2015 23:52:26 -0800 |
Siddharth Agarwal |
filemerge: add support for change/delete conflicts to the ':prompt' tool
|
| Wed, 18 Nov 2015 15:41:50 -0800 |
Siddharth Agarwal |
filemerge: add support for change/delete conflicts to the ':other' merge tool
|
| Wed, 18 Nov 2015 15:40:28 -0800 |
Siddharth Agarwal |
filemerge: add support for change/delete conflicts to the ':local' merge tool
|
| Thu, 19 Nov 2015 10:50:02 -0800 |
Siddharth Agarwal |
merge.mergestate: compute dirstate action
|
| Wed, 18 Nov 2015 14:22:52 -0800 |
Siddharth Agarwal |
filemerge: return whether the file was deleted
|
| Wed, 18 Nov 2015 13:55:31 -0800 |
Siddharth Agarwal |
filemerge: return whether the file is deleted from all other merge tools
|
| Wed, 18 Nov 2015 13:52:28 -0800 |
Siddharth Agarwal |
filemerge: return whether the file is deleted for nomerge internal tools
|
| Wed, 18 Nov 2015 15:46:45 -0800 |
Siddharth Agarwal |
mergestate: allow storing and retrieving change/delete conflicts
|
| Thu, 19 Nov 2015 12:50:10 +0530 |
Shubhanshu Agrawal |
strip: changing bookmark argument to be a list
|
| Sun, 15 Nov 2015 21:03:44 +0530 |
Shubhanshu Agrawal |
strip: strip a list of bookmarks
|
| Wed, 18 Nov 2015 23:23:03 -0800 |
Pierre-Yves David |
revset: speed up '_matchfiles'
|
| Wed, 18 Nov 2015 15:46:45 -0800 |
Siddharth Agarwal |
mergestate: handle additional record types specially
|
| Wed, 18 Nov 2015 23:42:32 -0800 |
Siddharth Agarwal |
test-resolve.t: remove completely unnecessary line
|
| Wed, 18 Nov 2015 23:43:18 -0800 |
Siddharth Agarwal |
resolve: fix incorrect merge
|
| Wed, 18 Nov 2015 20:55:32 +0100 |
liscju |
fileset: add missing() predicate (issue4925)
|
| Tue, 10 Nov 2015 17:22:40 +0800 |
Anton Shestakov |
webutil: make _siblings into an object with __iter__ and __len__
|
| Wed, 18 Nov 2015 16:39:30 -0800 |
Siddharth Agarwal |
mergestate: move binary format documentation into _readrecordsv2
|
| Wed, 18 Nov 2015 15:11:23 -0800 |
Siddharth Agarwal |
unshelve: add support for custom merge tools
|
| Wed, 18 Nov 2015 15:18:16 -0800 |
Siddharth Agarwal |
unshelve: shed spurious space
|
| Wed, 18 Nov 2015 15:04:03 -0800 |
Siddharth Agarwal |
unshelve: add -k as short form of --keep
|
| Sun, 01 Nov 2015 13:55:21 +0900 |
Yuya Nishihara |
import-checker: allow symbol imports from hgweb.common and .request
|
| Thu, 19 Nov 2015 15:02:27 -0600 |
Matt Mackall |
perf: un-bitrot perfstatus
|
| Thu, 19 Nov 2015 13:15:17 -0600 |
Matt Mackall |
util: drop statmtimesec
|
| Thu, 19 Nov 2015 13:21:24 -0600 |
Matt Mackall |
util: disable floating point stat times (issue4836)
|
| Wed, 18 Nov 2015 15:58:06 -0800 |
Laurent Charignon |
rebase: refactoring to avoid repetition of expression
|
| Wed, 18 Nov 2015 16:06:00 -0800 |
Laurent Charignon |
rebase: remove an unused todo
|
| Wed, 18 Nov 2015 13:44:29 -0800 |
Laurent Charignon |
rebase: don't rebase obsolete commits with no successor
|
| Wed, 18 Nov 2015 13:46:42 -0800 |
Laurent Charignon |
rebase: fix a typo in test-rebase-obsolete
|
| Wed, 18 Nov 2015 20:59:17 -0600 |
Matt Mackall |
merge with stable
|
| Sun, 01 Nov 2015 14:43:25 +0900 |
Yuya Nishihara |
hgweb: unify import style of error classes
|
| Sun, 01 Nov 2015 14:00:14 +0900 |
Yuya Nishihara |
hgweb: do not import templatefilters.revescape and websub as symbol
|
| Sun, 01 Nov 2015 13:58:32 +0900 |
Yuya Nishihara |
hgweb: alias ui module as uimod
|
| Tue, 17 Nov 2015 14:23:26 -0800 |
Siddharth Agarwal |
mergestate.commit: factor out making the list of records
|
| Tue, 17 Nov 2015 14:04:56 -0800 |
Siddharth Agarwal |
mergestate: move _read() call to read constructor
|
| Tue, 17 Nov 2015 14:22:30 -0800 |
Siddharth Agarwal |
debugmergestate: explain why we create mergestate objects directly
|
| Wed, 11 Nov 2015 13:28:00 -0800 |
Christian Delahousse |
debugdirstate: convert keyword parameters to **opts
|
| Tue, 17 Nov 2015 18:01:21 -0800 |
Christian Delahousse |
convert: changed test's progress output format to ignore estimate
|
| Tue, 17 Nov 2015 13:12:33 -0800 |
Laurent Charignon |
mq: use repo._bookmarks.recordchange instead of repo._bookmarks.write
|
| Tue, 17 Nov 2015 13:12:46 -0800 |
Laurent Charignon |
mq: indentation change to make the next patch more legible
|
| Tue, 17 Nov 2015 12:49:57 -0800 |
Laurent Charignon |
bookmarks: use repo._bookmarks.recordchange instead of repo._bookmarks.write
|
| Wed, 18 Nov 2015 01:36:58 -0800 |
Laurent Charignon |
localrepo: put bookmark move following commit in one transaction
|
| Tue, 17 Nov 2015 15:43:21 -0800 |
Siddharth Agarwal |
test-resolve.t: switch to mergestate.read()
|
| Tue, 17 Nov 2015 13:58:50 -0800 |
Siddharth Agarwal |
localrepo.commit: switch to mergestate.read()
|
| Tue, 17 Nov 2015 13:57:38 -0800 |
Siddharth Agarwal |
fileset: switch to mergestate.read()
|
| Tue, 17 Nov 2015 14:20:55 -0800 |
Siddharth Agarwal |
commands.summary: switch to mergestate.read()
|
| Tue, 17 Nov 2015 13:56:46 -0800 |
Siddharth Agarwal |
commands.resolve: switch to mergestate.read()
|
| Tue, 17 Nov 2015 13:56:10 -0800 |
Siddharth Agarwal |
shelve: switch to mergestate.read()
|
| Tue, 17 Nov 2015 13:55:30 -0800 |
Siddharth Agarwal |
mergestate: add a constructor that reads state from disk
|
| Tue, 17 Nov 2015 17:04:53 -0800 |
Siddharth Agarwal |
merge.applyupdates: switch to mergestate.clean()
|
| Tue, 17 Nov 2015 17:04:32 -0800 |
Siddharth Agarwal |
localrepo: switch to mergestate.clean()
|
| Tue, 17 Nov 2015 17:02:35 -0800 |
Siddharth Agarwal |
strip: switch to mergestate.clean()
|
| Tue, 17 Nov 2015 17:00:54 -0800 |
Siddharth Agarwal |
mergestate: add a constructor that sets up a clean merge state
|
| Tue, 17 Nov 2015 14:11:52 -0800 |
Siddharth Agarwal |
mergestate: raise structured exception for unsupported merge records
|
| Tue, 17 Nov 2015 14:10:12 -0800 |
Siddharth Agarwal |
error: add a structured exception for unsupported merge records
|
| Tue, 17 Nov 2015 13:47:16 -0800 |
Bryan O'Sullivan |
dirstate: back out 502b56a9e897
|
| Tue, 17 Nov 2015 13:47:14 -0800 |
Bryan O'Sullivan |
osutil: make statfiles check for interrupts periodically
|
| Tue, 17 Nov 2015 13:43:09 -0800 |
Bryan O'Sullivan |
osutil: don't leak on statfiles error
|
| Thu, 12 Nov 2015 12:44:15 +0100 |
liscju |
histedit: extracts _isdirtywc function
|
| Mon, 16 Nov 2015 11:23:32 -0800 |
Siddharth Agarwal |
node: add 'nullhex', hex-encoded nullid
|
| Mon, 16 Nov 2015 11:45:35 -0800 |
Siddharth Agarwal |
filemerge: introduce class whose objects represent files not in a context
|
| Mon, 16 Nov 2015 11:27:27 -0800 |
Siddharth Agarwal |
filectx: add isabsent method
|
| Fri, 13 Nov 2015 22:37:51 -0800 |
Siddharth Agarwal |
filectx: allow custom comparators
|
| Fri, 13 Nov 2015 23:01:36 -0800 |
Siddharth Agarwal |
debugmergestate: print out record type for files
|
| Sun, 15 Nov 2015 22:45:20 -0800 |
Siddharth Agarwal |
merge.applyupdates: don't return early if merge driver's conclude failed
|
| Mon, 16 Nov 2015 17:15:36 -0800 |
Laurent Charignon |
convert: use repo._bookmarks.recordchange instead of repo._bookmarks.write
|
| Mon, 16 Nov 2015 17:14:15 -0800 |
Laurent Charignon |
convert: indentation change to make the next patch more legible
|
| Sun, 15 Nov 2015 20:27:27 +0530 |
Shubhanshu Agrawal |
strip: renaming local variables
|
| Wed, 11 Feb 2015 22:22:29 -0800 |
Martin von Zweigbergk |
test-rename-merge2: make selected output less arbitrary
|
| Sun, 15 Nov 2015 22:11:23 -0500 |
Matt Harbison |
test-convert-git: drop a git warning that doesn't occur on Windows
|
| Sun, 15 Nov 2015 21:12:13 -0500 |
Matt Harbison |
tests: fix globs for Windows
|
| Sun, 15 Nov 2015 22:58:28 +0100 |
liscju |
pull: return 255 value on update failure (issue4948) (BC)
|
| Wed, 11 Nov 2015 10:19:11 -0800 |
Martin von Zweigbergk |
filemerge: remove leading space from " no tool found..."
|
| Mon, 09 Nov 2015 22:31:01 +0900 |
Yuya Nishihara |
test-encoding: enable fuzz testing of utf8b roundtrip
|
| Sun, 01 Nov 2015 17:42:03 +0900 |
Yuya Nishihara |
import-checker: reset context to verify convention in function scope
|
| Sun, 01 Nov 2015 00:37:22 +0900 |
Yuya Nishihara |
import-checker: allow import of child modules from package root
|
| Mon, 02 Nov 2015 17:17:33 -0600 |
Matt Mackall |
encoding: extend test cases for utf8b
|
| Fri, 13 Nov 2015 22:43:09 -0800 |
Siddharth Agarwal |
merge: make 'cd' and 'dc' actions store the same arguments as 'm'
|
| Fri, 13 Nov 2015 14:24:22 -0800 |
Siddharth Agarwal |
merge: stop emptying out 'cd' and 'dc' actions
|
| Sun, 15 Nov 2015 22:18:48 +0100 |
liscju |
rebase: add returning value from pullrebase function
stable
|
| Fri, 13 Nov 2015 15:56:02 -0800 |
Siddharth Agarwal |
resolve: restore .orig only after merge is fully complete (issue4952)
stable
|
| Fri, 06 Nov 2015 22:32:00 +0800 |
Anton Shestakov |
monoblue: add a space to separate navigation links in file log footer
|
| Thu, 12 Nov 2015 13:14:03 -0800 |
Martin von Zweigbergk |
merge: move messages about possible conflicts a litte earlier
|
| Sun, 01 Nov 2015 15:46:06 +0900 |
Yuya Nishihara |
import-checker: include lineno in warning message
|
| Sun, 01 Nov 2015 15:39:25 +0900 |
Yuya Nishihara |
import-checker: extract function to generate a formatted warning
|
| Sun, 01 Nov 2015 13:53:05 +0900 |
Yuya Nishihara |
import-checker: make it executable for convenience
|
| Mon, 09 Nov 2015 17:20:50 -0500 |
Matt Harbison |
test-fileset: glob the updated file count for Windows stability
|
| Mon, 09 Nov 2015 13:12:35 -0500 |
Matt Harbison |
tests: tolerate differences between Linux and Windows error strings
|
| Mon, 09 Nov 2015 12:51:58 -0500 |
Matt Harbison |
test-largefiles-cache: add glob for Windows
|
| Mon, 09 Nov 2015 12:49:31 -0500 |
Matt Harbison |
tests: make 'f' tool open files in binary mode when hexdumping
|
| Thu, 12 Nov 2015 14:29:02 -0800 |
Siddharth Agarwal |
merge.applyupdates: only attempt to merge files in mergeactions
|
| Wed, 11 Nov 2015 17:34:28 -0800 |
Siddharth Agarwal |
filemerge: rename _symlinkcheck to _mergecheck
|
| Wed, 11 Nov 2015 17:32:41 -0800 |
Siddharth Agarwal |
test-merge-prompt.t: rename to test-merge-changedelete.t
|
| Thu, 12 Nov 2015 20:48:41 -0600 |
Matt Mackall |
merge with stable
|
| Thu, 12 Nov 2015 13:16:04 -0800 |
Gregory Szorc |
tags: create new sortdict for performance reasons
stable
|
| Tue, 10 Nov 2015 15:08:56 -0800 |
Christian Delahousse |
largefiles: specify where .orig files are kept
|
| Tue, 10 Nov 2015 14:52:54 -0800 |
Christian Delahousse |
mq: let the user choose where .orig files are kept
|
| Tue, 10 Nov 2015 14:41:14 -0800 |
Christian Delahousse |
shelve: choose where .orig file locations are kept
|
| Tue, 10 Nov 2015 16:25:59 -0800 |
Christian Delahousse |
filemerge: choose where .orig files are kept
|
| Tue, 10 Nov 2015 14:29:13 -0800 |
Christian Delahousse |
git-subrepos: revert respects specified location to save .orig files
|
| Tue, 10 Nov 2015 14:26:19 -0800 |
Christian Delahousse |
resolve: choose where .orig file locations are kept
|
| Thu, 12 Nov 2015 17:00:08 -0600 |
Christian Delahousse |
revert: allow configuring the .orig file location
|
| Thu, 12 Nov 2015 16:56:06 -0600 |
Christian Delahousse |
cmdutil: add origbackuppath helper
|
| Tue, 10 Nov 2015 11:16:25 -0800 |
Ryan McElroy |
discovery: pass pushop to _nowarnheads
|
| Tue, 10 Nov 2015 11:13:21 -0800 |
Ryan McElroy |
exchange: pass pushop to discovery.checkheads
|
| Thu, 12 Nov 2015 15:26:30 -0600 |
Matt Mackall |
merge with stable
|
| Fri, 13 Nov 2015 02:36:30 +0900 |
FUJIWARA Katsunori |
share: wrap bmstore._writerepo for transaction sensitivity (issue4940)
stable
|
| Sat, 07 Nov 2015 13:48:42 -0500 |
Pierre-Yves David |
test: use generaldelta in 'test-clonebundle.t'
|
| Tue, 20 Oct 2015 13:14:04 +0200 |
Pierre-Yves David |
test: use generaldelta in 'test-ssh.t'
|
| Tue, 20 Oct 2015 13:14:31 +0200 |
Pierre-Yves David |
test: use generaldelta in 'test-ssh-bundle1.t'
|
| Tue, 20 Oct 2015 13:09:43 +0200 |
Pierre-Yves David |
test: use generaldelta in 'test-strip.t'
|
| Tue, 20 Oct 2015 12:39:49 +0200 |
Pierre-Yves David |
test: use generaldelta in 'test-rebase-newancestors.t'
|
| Tue, 20 Oct 2015 12:09:18 +0200 |
Pierre-Yves David |
test: use general delta for 'test-commit-amend.t'
|
| Tue, 20 Oct 2015 11:50:55 +0200 |
Pierre-Yves David |
test: wider matching in 'test-clone-r.t'
|
| Tue, 20 Oct 2015 11:48:49 +0200 |
Pierre-Yves David |
test: use generaldelta in 'test-bundle-type.t'
|
| Tue, 20 Oct 2015 10:46:59 +0200 |
Pierre-Yves David |
test: use generaldelta in 'test-patchbomb.t'
|
| Tue, 20 Oct 2015 10:37:07 +0200 |
Pierre-Yves David |
test: use generaldelta for test-bundle.t
|
| Tue, 20 Oct 2015 03:14:36 +0200 |
Pierre-Yves David |
test: use generaldelta in 'test-rebase-conflict.t'
|
| Mon, 19 Oct 2015 15:25:58 +0200 |
Pierre-Yves David |
tests: test generaldelta configuration in test-init.t
|
| Mon, 19 Oct 2015 11:28:31 +0200 |
Pierre-Yves David |
test: enable generaldelta early in 'test-treemanifest.t'
|
| Mon, 19 Oct 2015 10:48:02 +0200 |
Pierre-Yves David |
test: enable generaldelta in 'test-copy.t'
|
| Sun, 18 Oct 2015 19:04:29 +0200 |
Pierre-Yves David |
test: enable generaldelta in 'test-debugcommand.t'
|
| Sun, 18 Oct 2015 18:55:32 +0200 |
Pierre-Yves David |
test: use generaldelta in test-manifestv2.t
|
| Sun, 18 Oct 2015 18:36:39 +0200 |
Pierre-Yves David |
test: explicitly use generaldelta in 'test-rebase-mq-skip.t'
|
| Fri, 16 Oct 2015 02:54:52 +0100 |
Pierre-Yves David |
test: using generaldelta in 'test-lfconvert.t'
|
| Thu, 12 Nov 2015 02:52:19 -0800 |
Pierre-Yves David |
test: enforce generaldelta format with the right option
|
| Sat, 07 Nov 2015 13:53:11 -0500 |
Pierre-Yves David |
test: enforce non-generaldelta base repository in 'test-generaldelta'
|
| Tue, 20 Oct 2015 12:25:51 +0200 |
Pierre-Yves David |
test: use generaldelta in 'test-hgweb-command.t'
|
| Tue, 20 Oct 2015 12:28:42 +0200 |
Pierre-Yves David |
stream: sort stream capability before serialisation
|
| Tue, 20 Oct 2015 12:25:09 +0200 |
Pierre-Yves David |
test: spread capabilities replies in 'test-hgweb-commands'
|
| Sat, 07 Nov 2015 16:11:49 -0800 |
Durham Goode |
phase: improve retractboundary perf
|
| Thu, 12 Nov 2015 13:51:09 -0600 |
Matt Mackall |
merge with stable
|
| Mon, 02 Nov 2015 15:59:12 +0000 |
Pierre-Yves David |
format: introduce 'format.usegeneraldelta`
|
| Mon, 02 Nov 2015 16:52:34 +0000 |
Pierre-Yves David |
scmutil: extract general delta config handling in a function
|
| Tue, 10 Nov 2015 09:58:10 -0800 |
Danek Duvall |
test: test-bundle-type.t needs to work more universally
stable
|
| Tue, 10 Nov 2015 19:52:30 +0800 |
Anton Shestakov |
bash_completion: add -p|--patch|--stat support for shelve
|
| Sun, 08 Nov 2015 18:34:36 -0500 |
Matt Harbison |
test-convert-git: silence commit output for stablity
|
| Sun, 08 Nov 2015 17:56:48 -0500 |
Matt Harbison |
rebase: preserve the 'intermediate-source' attribute of grafts
|
| Wed, 11 Nov 2015 15:08:08 -0600 |
Matt Mackall |
merge with stable
|
| Wed, 04 Nov 2015 12:14:18 -0500 |
Augie Fackler |
verify: add a hook that can let extensions manipulate file lists
|
| Tue, 10 Nov 2015 17:16:59 -0800 |
Siddharth Agarwal |
resolve: don't abort when file is missing
|
| Tue, 10 Nov 2015 17:13:16 -0800 |
Siddharth Agarwal |
filemerge: treat EOF at prompt as fail, not abort
|
| Tue, 10 Nov 2015 17:10:47 -0800 |
Siddharth Agarwal |
test-merge-tools.t: add 'hg resolve --list' output to tests
|
| Tue, 10 Nov 2015 00:46:45 -0800 |
Siddharth Agarwal |
error: add structured exception for EOF at prompt
|
| Mon, 09 Nov 2015 22:37:32 -0800 |
Siddharth Agarwal |
test-merge-prompt.t: unset HGMERGE
|
| Tue, 10 Nov 2015 23:02:59 +0800 |
Anton Shestakov |
hgweb: compute changeset parents and children for log pages lazily
|
| Sun, 08 Nov 2015 23:42:44 -0800 |
Siddharth Agarwal |
filemerge: move :merge-local/other symlink check to precheck
|
| Sun, 08 Nov 2015 23:47:20 -0800 |
Siddharth Agarwal |
test-merge-types.t: add tests for :merge-local/:merge-other with symlinks
|
| Mon, 09 Nov 2015 16:24:13 -0600 |
Matt Mackall |
Added signature for changeset 1aa5083cbebb
stable
|
| Mon, 09 Nov 2015 16:24:08 -0600 |
Matt Mackall |
Added tag 3.6.1 for changeset 1aa5083cbebb
stable
|
| Mon, 09 Nov 2015 15:53:11 -0600 |
Matt Mackall |
posix: fix test-permissions regression
stable 3.6.1
|
| Sun, 08 Nov 2015 01:10:52 +0800 |
Anton Shestakov |
dockerlib: allow non-unique uid and gid of $DBUILDUSER (issue4657)
stable
|
| Mon, 09 Nov 2015 10:43:23 -0800 |
Mateusz Kwapich |
dirstate: fix filefoldmap incosistency on file delete
stable
|
| Mon, 09 Nov 2015 09:41:20 -0600 |
Steve Borho |
wix: style-coal.css has been renamed
stable
|
| Mon, 09 Nov 2015 12:49:21 -0600 |
Matt Mackall |
merge with stable
|
| Thu, 05 Nov 2015 10:31:20 +0000 |
Javi Merino |
clonebundles: fix typo s/comand/command/
stable
|
| Fri, 06 Nov 2015 15:23:10 -0600 |
Matt Mackall |
posix: retry on symlink race in checklink
stable
|
| Fri, 06 Nov 2015 13:01:15 -0500 |
Pierre-Yves David |
changegroup: back code change of e7c618cee8df out
stable
|
| Fri, 06 Nov 2015 12:59:09 -0500 |
Pierre-Yves David |
changegroup: call 'prechangegroup' hook before setting up write delay
stable
|
| Fri, 06 Nov 2015 12:39:06 -0500 |
Pierre-Yves David |
changegroup: fix the scope of a try finally
stable
|
| Thu, 05 Nov 2015 17:30:10 -0600 |
Matt Mackall |
encoding: re-escape U+DCxx characters in toutf8b input (issue4927)
|
| Thu, 05 Nov 2015 17:21:43 -0600 |
Matt Mackall |
encoding: use getutf8char in toutf8b
|
| Thu, 05 Nov 2015 17:11:50 -0600 |
Matt Mackall |
encoding: handle non-BMP characters in fromutf8b
|
| Thu, 05 Nov 2015 17:09:00 -0600 |
Matt Mackall |
posix: use getutf8char to handle OS X filename percent-escaping
|
| Thu, 05 Nov 2015 16:48:46 -0600 |
Matt Mackall |
encoding: add getutf8char helper
|
| Sat, 07 Nov 2015 16:03:09 -0500 |
Pierre-Yves David |
unbundle: gratuitous fix white spacing "issue"
|
| Sun, 01 Nov 2015 21:19:09 +0900 |
Yuya Nishihara |
demandimport: fix level passed to loader of sub-modules
stable
|
| Sat, 07 Nov 2015 17:43:20 +0900 |
Yuya Nishihara |
parsers: fix width of datalen variable in fm1readmarkers
stable
|
| Thu, 05 Nov 2015 18:56:40 -0800 |
Durham Goode |
manifest: skip fastdelta if the change is large
|
| Wed, 04 Nov 2015 23:44:51 -0800 |
Siddharth Agarwal |
merge.mergestate: update docstrings for preresolve and resolve
|
| Mon, 26 Oct 2015 02:35:48 -0700 |
Stanislau Hlebik |
rebase: pass date parameter to concludenode
|
| Mon, 26 Oct 2015 02:22:26 -0700 |
Stanislau Hlebik |
rebase: add date parameter to concludenode function
|
| Sat, 24 Oct 2015 09:47:33 +0100 |
Anton Shestakov |
hgweb: remove unused colorPart() from mercurial.js
|
| Sun, 18 Oct 2015 18:49:59 +0200 |
Pierre-Yves David |
test: enforce non-general delta in 'test-generaldelta.t'
|
| Tue, 20 Oct 2015 15:27:56 +0200 |
Pierre-Yves David |
test: enforce bundle1 in 'test-push-cgi.t'
|
| Sun, 18 Oct 2015 18:42:09 +0200 |
Pierre-Yves David |
test: enforce v1 in 'test-debugbundle.t'
|
| Tue, 20 Oct 2015 02:39:42 +0200 |
Pierre-Yves David |
test: enforce bundle1 in "test-commit-interactive.t"
|
| Fri, 06 Nov 2015 09:48:24 -0800 |
Ryan McElroy |
discovery: factor out calculation of heads to not warn about
|
| Fri, 06 Nov 2015 11:08:11 -0500 |
Pierre-Yves David |
hooks: back 9f272bf3b342 out
stable
|
| Wed, 04 Nov 2015 15:17:52 -0600 |
Matt Mackall |
merge with stable
|
| Tue, 03 Nov 2015 17:13:27 -0800 |
Durham Goode |
hooks: fix hooks not firing if prechangegroup was set (issue4934)
stable
|
| Tue, 03 Nov 2015 16:58:13 -0800 |
Durham Goode |
hooks: always include HG_PENDING
stable
|
| Tue, 03 Nov 2015 12:31:33 -0800 |
Gregory Szorc |
wireproto: move clonebundles command from extension (issue4931)
stable
|
| Wed, 04 Nov 2015 23:48:15 +0900 |
Yuya Nishihara |
templatefilters: try round-trip utf-8 conversion by json filter (issue4933)
stable
|
| Tue, 03 Nov 2015 12:16:54 -0800 |
Gregory Szorc |
exchange: do not attempt clone bundle if local repo is non-empty (issue4932)
stable
|
| Tue, 03 Nov 2015 12:15:14 -0800 |
Gregory Szorc |
test-clonebundles.t: add test for incremental pull
stable
|
| Tue, 03 Nov 2015 22:44:57 +0900 |
Yuya Nishihara |
i18n: make sure to include translation of (DEPRECATED)
stable
|
| Tue, 03 Nov 2015 22:39:26 +0900 |
Yuya Nishihara |
i18n: do not abuse msgstr of "DEPRECATED" to check for bad translation
stable
|
| Mon, 02 Nov 2015 12:12:24 -0800 |
Siddharth Agarwal |
filemerge.prompt: separate out choice selection and action
|
| Mon, 02 Nov 2015 12:25:15 -0800 |
Siddharth Agarwal |
test-merge-prompt.t: add tests for linear updates + change/delete conflicts
|
| Sat, 24 Oct 2015 16:25:16 -0700 |
Siddharth Agarwal |
test-pathencode.py: drop support for Python 2.4
|
| Sat, 24 Oct 2015 16:23:42 -0700 |
Siddharth Agarwal |
hgweb.server: drop support for Python 2.4
|
| Sat, 24 Oct 2015 15:56:16 -0700 |
Siddharth Agarwal |
util: drop Python 2.4 compat by directly importing md5 and sha1
|
| Mon, 02 Nov 2015 23:37:49 +0800 |
Anton Shestakov |
hgweb: replace some str.split() calls by str.partition() or str.rpartition()
|
| Mon, 02 Nov 2015 23:37:14 +0800 |
Anton Shestakov |
help: replace some str.split() calls by str.partition() or str.rpartition()
|
| Sat, 24 Oct 2015 01:54:46 +0200 |
Mads Kiilerich |
convert: test clean p2 file missing
|
| Mon, 02 Nov 2015 11:56:59 +0000 |
Pierre-Yves David |
uescape: also encode non-printable char under 128
|
| Sat, 24 Oct 2015 12:46:03 +0100 |
David R. MacIver |
testing: add hypothesis fuzz testing
|
| Mon, 02 Nov 2015 13:00:45 +0000 |
Pierre-Yves David |
merge with stable
|
| Sun, 01 Nov 2015 13:04:14 -0600 |
Matt Mackall |
Added signature for changeset 47dd34f2e727
stable
|
| Sun, 01 Nov 2015 13:04:09 -0600 |
Matt Mackall |
Added tag 3.6 for changeset 47dd34f2e727
stable
|
| Sun, 01 Nov 2015 08:38:56 +0900 |
FUJIWARA Katsunori |
i18n: look translation of both "DEPRECATED" and "(DEPRECATED)" up
stable 3.6
|
| Sun, 01 Nov 2015 08:38:56 +0900 |
FUJIWARA Katsunori |
i18n: fix regexp pattern to detect translation for DEPRECATED
stable
|
| Sat, 31 Oct 2015 21:45:46 -0400 |
Matt Harbison |
scmutil: abort if an empty revision is given to revpair()
stable
|
| Sun, 01 Nov 2015 15:24:57 -0200 |
Wagner Bruna |
i18n-pt_BR: synchronized with a9ed5a8fc5e0
stable
|
| Sun, 01 Nov 2015 05:34:27 +0900 |
FUJIWARA Katsunori |
i18n-ja: synchronized with 6474b64045fb
stable
|
| Mon, 26 Oct 2015 14:19:37 -0400 |
Augie Fackler |
packaging: rework version detection and declaration (issue4912)
stable
|
| Tue, 27 Oct 2015 12:34:05 +0800 |
Anton Shestakov |
hgweb: escape class keyword when used as a js object property (issue4913)
stable
|
| Sat, 24 Oct 2015 18:58:57 +0900 |
FUJIWARA Katsunori |
localrepo: discard objects in _filecache at transaction failure (issue4876)
stable
|
| Wed, 28 Oct 2015 16:27:09 +0100 |
Gábor Stefanik |
demandimport: fix TypeError when importing Python regex library (issue4920)
stable
|
| Sat, 24 Oct 2015 00:39:22 +0100 |
Gregory Szorc |
bundle2: attribute remote failures to remote (issue4788)
stable
|
| Sat, 24 Oct 2015 00:39:26 +0100 |
Gregory Szorc |
tests: add tests for remote hook output (issue4788)
stable
|
| Sat, 24 Oct 2015 06:59:26 +0100 |
Yuya Nishihara |
help: mention alias and revsetalias in description of HGPLAINEXCEPT
stable
|
| Fri, 23 Oct 2015 11:04:53 -0400 |
Augie Fackler |
debugrevlog: cope with empty revlog files
stable
|
| Fri, 23 Oct 2015 21:27:29 +0200 |
Mads Kiilerich |
largefiles: don't mute and obfuscate http errors when putlfile fails
stable
|
| Fri, 23 Oct 2015 21:27:29 +0200 |
Mads Kiilerich |
largefiles: test coverage of error handling from putlfile
stable
|
| Fri, 23 Oct 2015 21:27:29 +0200 |
Mads Kiilerich |
largefiles: check hash of files in the store before copying to working dir
stable
|
| Fri, 23 Oct 2015 21:27:29 +0200 |
Mads Kiilerich |
largefiles: test coverage of handling of store corruption
stable
|
| Fri, 23 Oct 2015 06:06:22 -0400 |
Augie Fackler |
merge: improve clarity of table in update docstring
stable
|
| Thu, 22 Oct 2015 18:59:03 +0000 |
Gregory Szorc |
ui: support paths.default-push without paths.default set (issue4914)
stable
|
| Wed, 21 Oct 2015 16:21:27 -0500 |
Matt Mackall |
bookmarks: don't allow pushing new head for existing mark with -B (issue4400)
stable
|
| Tue, 20 Oct 2015 18:46:00 -0400 |
timeless |
commands: fix help for debugobsolete
stable
|
| Wed, 21 Oct 2015 00:18:11 +0200 |
Mads Kiilerich |
largefiles: fix explicit commit of normal/largefile switch
stable
|
| Wed, 21 Oct 2015 00:10:46 +0200 |
Mads Kiilerich |
largefiles: test coverage of explicit commit of normal/largefile switch
stable
|
| Tue, 20 Oct 2015 16:00:02 -0500 |
Matt Mackall |
Added signature for changeset b66e3ca0b90c
stable
|
| Tue, 20 Oct 2015 15:59:58 -0500 |
Matt Mackall |
Added tag 3.6-rc for changeset b66e3ca0b90c
stable
|
| Tue, 20 Oct 2015 15:59:10 -0500 |
Matt Mackall |
merge default into stable for code freeze
stable 3.6-rc
|
| Mon, 19 Oct 2015 16:49:54 +0200 |
Mads Kiilerich |
convert: fix Python syntax in 'splice in' message
|
| Mon, 19 Oct 2015 16:29:35 +0200 |
Mads Kiilerich |
rebase: fix wrong 'no changes to commit' when using --collapse
|
| Mon, 19 Oct 2015 15:47:40 -0700 |
Sean Farley |
pull: all pass along extra opargs
|
| Mon, 19 Oct 2015 15:43:35 -0700 |
Sean Farley |
push: all pass along opargs
|
| Thu, 15 Oct 2015 17:28:26 -0400 |
timeless |
check-code: allow argument passing py2.6ism
|
| Thu, 15 Oct 2015 17:24:42 -0400 |
timeless |
mail: drop python 2.5 self.sock.read workaround
|
| Thu, 15 Oct 2015 17:21:08 -0400 |
timeless |
url: drop support for python2.5
|
| Thu, 15 Oct 2015 17:19:11 -0400 |
timeless |
win32: drop reference to python2.5
|
| Mon, 19 Oct 2015 21:36:12 -0700 |
Ryan McElroy |
editmerge: dequote other use of $ED
|
| Mon, 19 Oct 2015 16:01:55 +0200 |
Pierre-Yves David |
bundlerepo: properly extract compressed changegroup from bundle2
|
| Fri, 02 Oct 2015 23:21:39 -0700 |
Pierre-Yves David |
bundle2: make unbundle.compressed return True when compressed
|
| Mon, 19 Oct 2015 18:04:08 +0200 |
Pierre-Yves David |
bundlerepo: uncompress changegroup in bundle1 case only
|
| Mon, 19 Oct 2015 17:58:04 +0200 |
Pierre-Yves David |
bundlerepo: move temp-bundle writing logic into a closure
|
| Mon, 19 Oct 2015 15:42:50 +0200 |
Pierre-Yves David |
shelve: properly process bundle2 bundle
|
| Tue, 20 Oct 2015 03:07:23 +0200 |
Pierre-Yves David |
histedit: properly apply bundle2 backups
|
| Tue, 20 Oct 2015 16:01:33 +0200 |
Pierre-Yves David |
strip: pass source and url to bundle2 processing
|
| Tue, 20 Oct 2015 15:56:22 +0200 |
Pierre-Yves David |
unbundle: use 'url' argument with applybundle
|
| Tue, 20 Oct 2015 15:55:04 +0200 |
Pierre-Yves David |
applybundle: take url as argument
|
| Tue, 20 Oct 2015 15:53:07 +0200 |
Pierre-Yves David |
unbundle: use 'source' argument with applybundle
|
| Tue, 20 Oct 2015 15:52:42 +0200 |
Pierre-Yves David |
applybundle: take source as argument
|
| Tue, 20 Oct 2015 15:48:24 +0200 |
Pierre-Yves David |
applybundle: set 'bundle2=1' env for all transaction
|
| Tue, 20 Oct 2015 15:47:20 +0200 |
Pierre-Yves David |
unbundle: use 'bundle2.applybundle'
|
| Tue, 20 Oct 2015 15:45:39 +0200 |
Pierre-Yves David |
bundle2: introduce an "applybundle" function
|
| Thu, 15 Oct 2015 01:31:04 -0700 |
Siddharth Agarwal |
commands.resolve: conclude merge driver if no unresolved files are left
|
| Thu, 15 Oct 2015 01:27:06 -0700 |
Siddharth Agarwal |
commands.resolve: call driverpreprocess if we haven't run it yet
|
| Thu, 15 Oct 2015 01:22:01 -0700 |
Siddharth Agarwal |
merge.applyupdates: call driverconclude after performing merge actions
|
| Thu, 15 Oct 2015 01:19:10 -0700 |
Siddharth Agarwal |
merge.applyupdates: call driverpreprocess before starting merge actions
|
| Thu, 15 Oct 2015 01:17:29 -0700 |
Siddharth Agarwal |
merge: add stubs for preprocess and conclude steps of merge driver
|
| Thu, 15 Oct 2015 01:15:22 -0700 |
Siddharth Agarwal |
commands.resolve: don't allow users to mark or unmark driver-resolved files
|
| Thu, 15 Oct 2015 01:11:50 -0700 |
Siddharth Agarwal |
resolve: only create wctx once
|
| Mon, 19 Oct 2015 12:07:17 -0700 |
James Mills |
dirstate: fix invalid reference to self.ui
|
| Sat, 17 Oct 2015 00:58:46 +0200 |
Mads Kiilerich |
spelling: trivial spell checking
|
| Wed, 14 Oct 2015 03:30:27 -0400 |
timeless |
mq: consistently use qrefresh
|
| Wed, 14 Oct 2015 02:06:54 -0400 |
timeless |
grammar: use does instead of do where appropriate
|
| Wed, 14 Oct 2015 22:29:03 -0400 |
timeless |
l10n: use %d instead of %s for numbers
|
| Thu, 15 Oct 2015 20:36:12 -0400 |
timeless |
check-code: block non-portable pipe-and
|
| Thu, 15 Oct 2015 20:32:01 -0400 |
timeless |
test-shelve: do not use non-portable pipe-and
|
| Sun, 18 Oct 2015 09:05:04 +0900 |
Yuya Nishihara |
parsers: suppress warning of signed and unsigned comparison at nt_init
|
| Sat, 17 Oct 2015 23:14:13 +0900 |
Yuya Nishihara |
parsers: correct type of temporary variables for dirstate tuple fields
|
| Fri, 16 Oct 2015 02:53:57 +0100 |
Pierre-Yves David |
test: enforce v1 type in 'test-bundle2-remote-changegroup.t'
|
| Fri, 16 Oct 2015 02:51:34 +0100 |
Pierre-Yves David |
test: enforce v1 type in 'test-bundle2-format.t'
|
| Sat, 17 Oct 2015 15:48:14 -0700 |
Ryan McElroy |
editmerge: properly quote variables
|
| Thu, 15 Oct 2015 01:09:58 -0700 |
Siddharth Agarwal |
commands.resolve: print out warning when only driver-resolved files remain
|
| Thu, 15 Oct 2015 01:06:29 -0700 |
Siddharth Agarwal |
merge.mergestate: set merge driver state to 's' if there's none present
|
| Thu, 15 Oct 2015 01:04:46 -0700 |
Siddharth Agarwal |
merge.mergestate: only check for merge driver when property is accessed
|
| Thu, 15 Oct 2015 01:02:32 -0700 |
Siddharth Agarwal |
localrepo.commit: abort if merge driver's conclude step hasn't been run yet
|
| Thu, 15 Oct 2015 00:57:56 -0700 |
Siddharth Agarwal |
merge.mergestate: add a way to get the merge driver state
|
| Thu, 15 Oct 2015 00:49:07 -0700 |
Siddharth Agarwal |
merge.mergestate: add a way to get the other side of the merge
|
| Thu, 15 Oct 2015 00:45:20 -0700 |
Siddharth Agarwal |
commands.resolve: support printing out driver-resolved files
|
| Sat, 17 Oct 2015 12:32:23 -0700 |
Durham Goode |
histedit: make histedit prune when obsolete is enabled
|
| Sat, 17 Oct 2015 11:23:54 -0700 |
Gregory Szorc |
clonebundles: rewrite documentation
|
| Sat, 17 Oct 2015 11:37:08 -0700 |
Gregory Szorc |
exchange: support streaming clone bundles in clone bundles
|
| Sat, 17 Oct 2015 10:26:34 -0700 |
Gregory Szorc |
exchange: parse requirements from stream clone specification string
|
| Wed, 14 Oct 2015 17:00:34 -0700 |
Gregory Szorc |
exchange: support parameters in bundle specification strings
|
| Thu, 15 Oct 2015 13:43:18 -0700 |
Gregory Szorc |
commands: support consuming stream clone bundles
|
| Sat, 17 Oct 2015 11:40:29 -0700 |
Gregory Szorc |
commands: support creating stream clone bundles
|
| Thu, 15 Oct 2015 13:00:45 -0700 |
Gregory Szorc |
exchange: support for streaming clone bundles
|
| Sat, 17 Oct 2015 11:14:52 -0700 |
Gregory Szorc |
streamclone: support for producing and consuming stream clone bundles
|
| Sat, 17 Oct 2015 15:28:02 -0500 |
Matt Mackall |
spelling: fix typo in transaction error messages
|
| Fri, 16 Oct 2015 03:29:51 +0900 |
FUJIWARA Katsunori |
transaction: reorder unlinking .hg/journal and .hg/journal.backupfiles
|
| Sat, 17 Oct 2015 01:15:34 +0900 |
FUJIWARA Katsunori |
merge: make in-memory changes visible to external update hooks
|
| Sat, 17 Oct 2015 01:15:34 +0900 |
FUJIWARA Katsunori |
hook: centralize passing HG_PENDING to external hook process
|
| Sat, 17 Oct 2015 01:15:34 +0900 |
FUJIWARA Katsunori |
cmdutil: make in-memory changes visible to external editor (issue4378)
|
| Sat, 17 Oct 2015 01:15:34 +0900 |
FUJIWARA Katsunori |
dirstate: show develwarn for write() invocation without transaction
|
| Sat, 17 Oct 2015 01:15:34 +0900 |
FUJIWARA Katsunori |
dirstate: make dirstate.write() callers pass transaction object to it
|
| Sat, 17 Oct 2015 01:15:34 +0900 |
FUJIWARA Katsunori |
dirstate: remove layering violation around writing dirstate out
|
| Sat, 17 Oct 2015 01:15:33 +0900 |
FUJIWARA Katsunori |
dirstateguard: remove layering violation around saving/restoring backup
|
| Thu, 15 Oct 2015 15:20:44 -0700 |
Christian Delahousse |
rebase: reduce scope of try catch in restorestate
|
| Thu, 15 Oct 2015 12:13:46 -0700 |
Christian Delahousse |
rebase: on abort delete rebase state file no matter what
|
| Fri, 16 Oct 2015 15:01:42 -0700 |
Christian Delahousse |
contrib: make editmerge look for merge markers at the beginning of the line
|
| Fri, 09 Oct 2015 21:44:54 -0700 |
Tony Tung |
commit: abort when a committemplate is not changed
|
| Wed, 14 Oct 2015 16:04:43 -0700 |
Siddharth Agarwal |
localrepo.commit: disallow commit when driver-resolved files exist
|
| Wed, 14 Oct 2015 15:01:07 -0700 |
Siddharth Agarwal |
merge.mergestate: add a generator for driver-resolved files
|
| Wed, 14 Oct 2015 16:27:10 -0700 |
Siddharth Agarwal |
hook: for python hooks, also return whether an exception was raised
|
| Wed, 14 Oct 2015 16:19:47 -0700 |
Siddharth Agarwal |
hook.runhooks: return a dict of result values
|
| Wed, 14 Oct 2015 16:13:31 -0700 |
Siddharth Agarwal |
hook: factor out determination of hooks from running them
|
| Tue, 10 Mar 2015 13:19:17 +0100 |
Mads Kiilerich |
mq: generate patch names from first line of description
|
| Thu, 15 Oct 2015 21:36:47 +0200 |
Mads Kiilerich |
contrib: offer Python 2.7.10
|
| Thu, 15 Oct 2015 21:35:49 +0200 |
Mads Kiilerich |
contrib: drop Python < 2.6 from Makefile.python
|
| Fri, 16 Oct 2015 11:37:34 +0200 |
Mads Kiilerich |
mergetools.rc: find OSX FileMerge in the new location inside Xcode 4.3
|
| Thu, 15 Oct 2015 14:53:32 -0700 |
Gregory Szorc |
exchange: don't print error codes after clone bundle failure
|
| Wed, 14 Oct 2015 14:53:15 -0400 |
Augie Fackler |
debian: install bash completion as hg and not mercurial (issue4900)
|
| Wed, 14 Oct 2015 12:57:33 -0400 |
Augie Fackler |
merge-tools: allow marking a mergetool as completely disabled
|
| Tue, 13 Oct 2015 23:04:53 -0700 |
Sean Farley |
exchange: add oparg to push so that extensions can wrap pushop
|
| Thu, 15 Oct 2015 03:15:54 +0100 |
Pierre-Yves David |
destmerge: extract logic based on branch heads in its own function
|
| Thu, 15 Oct 2015 03:13:14 +0100 |
Pierre-Yves David |
destmerge: extract logic based on bookmark into its own function
|
| Thu, 15 Oct 2015 03:00:09 +0100 |
Pierre-Yves David |
destupdate: have a generic and extensible way to run each step
|
| Thu, 15 Oct 2015 02:33:09 +0100 |
Pierre-Yves David |
destupdate: extract logic based on branch in its own function
|
| Thu, 15 Oct 2015 02:27:30 +0100 |
Pierre-Yves David |
destupdate: extract logic based on bookmarks in its own function
|
| Thu, 15 Oct 2015 02:15:43 +0100 |
Pierre-Yves David |
destupdate: extract logic based on obsolescence marker in its own function
|
| Thu, 15 Oct 2015 02:12:55 +0100 |
Pierre-Yves David |
destupdate: move obsolete handling first
|
| Thu, 15 Oct 2015 02:12:15 +0100 |
Pierre-Yves David |
destupdate: indent bookmark and branch logic
|
| Thu, 15 Oct 2015 14:10:57 +0100 |
Pierre-Yves David |
destupdate: extract validation logic
|
| Thu, 15 Oct 2015 01:56:03 +0100 |
Pierre-Yves David |
rebase: rename and test '_destrebase'
|
| Thu, 15 Oct 2015 01:51:53 +0100 |
Pierre-Yves David |
rebase: directly use '_destrebase'
|
| Thu, 15 Oct 2015 01:50:31 +0100 |
Pierre-Yves David |
rebase: extra default destination in its own function
|
| Thu, 15 Oct 2015 01:47:28 +0100 |
Pierre-Yves David |
revset: rename and test '_destmerge'
|
| Thu, 15 Oct 2015 01:19:32 +0100 |
Pierre-Yves David |
merge: directly get destination from destutil
|
| Thu, 15 Oct 2015 01:11:00 +0100 |
Pierre-Yves David |
destutil: move default merge destination into a function
|
| Thu, 15 Oct 2015 01:35:44 +0100 |
Pierre-Yves David |
revset: reintroduce and experimental revset for update destination
|
| Wed, 14 Oct 2015 15:11:53 -0400 |
Augie Fackler |
changegroup: move manifest unpacking into its own method
|
| Thu, 01 Oct 2015 15:35:10 -0400 |
Augie Fackler |
changegroup: move manifest packing into a separate function
|
| Wed, 30 Sep 2015 19:59:12 -0400 |
Augie Fackler |
changegroup: rename manifest linknode closure for clarity
|
| Tue, 29 Sep 2015 15:14:03 -0400 |
Augie Fackler |
changegroup: reformat packermap and add comment
|
| Wed, 14 Oct 2015 12:05:27 -0400 |
Augie Fackler |
changegroup: document the public surface area of cg?unpackers
|
| Wed, 14 Oct 2015 11:58:56 -0400 |
Augie Fackler |
changegroup: mark cg1unpacker.chunklength as private
|
| Wed, 14 Oct 2015 11:58:35 -0400 |
Augie Fackler |
changegroup: note why a few methods on cg1unpacker exist
|
| Wed, 14 Oct 2015 11:32:33 -0400 |
Augie Fackler |
revlog: rename bundle to cg to reflect its nature as a cg?unpacker
|
| Tue, 13 Oct 2015 17:16:10 -0400 |
Augie Fackler |
changegroup: mark _addchangegroupfiles as module-private
|
| Tue, 13 Oct 2015 17:14:37 -0400 |
Augie Fackler |
changegroup: delete now-unused addchangegroup method
|
| Tue, 13 Oct 2015 17:14:07 -0400 |
Augie Fackler |
localrepo: use cg?unpacker.apply() instead of changegroup.addchangegroup()
|
| Tue, 13 Oct 2015 17:12:46 -0400 |
Augie Fackler |
repair: use cg?unpacker.apply() instead of changegroup.addchangegroup()
|
| Tue, 13 Oct 2015 17:12:29 -0400 |
Augie Fackler |
exchange: use cg?unpacker.apply() instead of changegroup.addchangegroup()
|
| Tue, 13 Oct 2015 17:12:12 -0400 |
Augie Fackler |
commands: use cg?unpacker.apply() instead of changegroup.addchangegroup()
|
| Tue, 13 Oct 2015 17:11:52 -0400 |
Augie Fackler |
bundle2: use cg?unpacker.apply() instead of changegroup.addchangegroup()
|
| Tue, 13 Oct 2015 17:11:18 -0400 |
Augie Fackler |
shelve: use cg?unpacker.apply() instead of changegroup.addchangegroup()
|
| Tue, 13 Oct 2015 17:14:21 -0400 |
Augie Fackler |
histedit: use cg?unpacker.apply() instead of changegroup.addchangegroup()
|
| Tue, 13 Oct 2015 16:58:51 -0400 |
Augie Fackler |
changegroup: migrate addchangegroup() to forward to cg?unpacker.apply()
|
| Tue, 13 Oct 2015 15:54:05 -0400 |
Augie Fackler |
changegroup: move source check to top of addchangegroup
|
| Thu, 15 Oct 2015 09:52:32 -0400 |
Augie Fackler |
error: remove superfluous pass statements
|
| Mon, 12 Oct 2015 18:49:23 -0700 |
Siddharth Agarwal |
hook: raise a separate exception for when loading a hook fails
|
| Wed, 14 Oct 2015 11:05:53 -0700 |
Gregory Szorc |
clonebundles: advertise clone bundles feature to clients
|
| Wed, 14 Oct 2015 10:36:20 -0700 |
Gregory Szorc |
exchange: advertise if a clone bundle was attempted
|
| Tue, 13 Oct 2015 14:55:02 -0700 |
Gregory Szorc |
exchange: record that we attempted to fetch a clone bundle
|
| Tue, 13 Oct 2015 12:41:32 -0700 |
Gregory Szorc |
exchange: provide hint on how to disable clone bundles
|
| Wed, 14 Oct 2015 10:03:26 -0700 |
Gregory Szorc |
exchange: document filterclonebundleentries
|
| Wed, 14 Oct 2015 10:58:35 -0700 |
Gregory Szorc |
wireproto: properly parse false boolean args (BC)
|
| Thu, 15 Oct 2015 03:29:00 +0100 |
Pierre-Yves David |
bundle2: gracefully skip 'obsmarkers' part if evolution is disabled
|
| Thu, 15 Oct 2015 12:45:34 +0100 |
Pierre-Yves David |
obsstore: make the readonly attribute accessible
|
| Mon, 05 Oct 2015 04:26:26 -0700 |
Pierre-Yves David |
update: introduce a 'UpdateAbort' exception
|
| Mon, 05 Oct 2015 21:42:09 -0700 |
Pierre-Yves David |
update: "deprecate" call to 'merge.update' without a destination
|
| Wed, 14 Oct 2015 20:35:06 -0700 |
Christian Delahousse |
shelve: delete shelve statefile on any exception during abort
|
| Wed, 14 Oct 2015 18:22:16 -0700 |
Gregory Szorc |
highlight: add option to prevent content-only based fallback
|
| Wed, 14 Oct 2015 17:43:44 -0700 |
Gregory Szorc |
highlight: inline checkfctx()
|
| Wed, 14 Oct 2015 17:42:07 -0700 |
Gregory Szorc |
highlight: consolidate duplicate code
|
| Tue, 13 Oct 2015 14:06:51 -0700 |
Christian Delahousse |
rebase: properly abort when destination is public (issue4896)
|
| Wed, 14 Oct 2015 18:03:17 -0500 |
Matt Mackall |
bookmarks: don't deactivate on no-op update (issue4901)
|
| Thu, 15 Oct 2015 00:32:20 +0100 |
Pierre-Yves David |
rebase: properly handle chains of markers with missing nodes
|
| Wed, 14 Oct 2015 23:42:15 +0100 |
Pierre-Yves David |
rebase: use a direct reference to repo.changelog
|
| Wed, 14 Oct 2015 22:21:05 -0400 |
timeless |
mail: drop python 2.5 support
|
| Tue, 13 Oct 2015 22:53:08 -0700 |
Sean Farley |
exchange: use pushop.repo instead of repo
|
| Tue, 13 Oct 2015 03:20:05 -0700 |
Ryan McElroy |
rebase: factor out nothing to rebase return code
|
| Thu, 15 Oct 2015 00:04:58 +0800 |
Anton Shestakov |
gitweb: visually highlight source lines when hovering over line numbers
|
| Tue, 13 Oct 2015 14:17:15 -0700 |
Christian Delahousse |
rebase: added comments
|
| Wed, 14 Oct 2015 22:45:51 +0800 |
Anton Shestakov |
monoblue: visually highlight source lines when hovering over line numbers
|
| Wed, 14 Oct 2015 22:24:50 +0800 |
Anton Shestakov |
monoblue: make the size of line links bigger to cover line numbers better
|
| Sat, 26 Sep 2015 18:16:49 +0800 |
Anton Shestakov |
gitweb: don't drop current revision context on graph page
|
| Tue, 13 Oct 2015 16:05:30 -0700 |
Sean Farley |
util: also catch IndexError
|
| Wed, 14 Oct 2015 12:23:49 +0200 |
Adrian Buehlmann |
exewrapper: add comments about PYTHONHOME
|
| Wed, 14 Oct 2015 12:23:04 +0200 |
Adrian Buehlmann |
exewrapper: report name of failed private DLL in error message
|
| Wed, 14 Oct 2015 12:22:09 +0200 |
Adrian Buehlmann |
exewrapper: report name of failed DLL in error message
|
| Tue, 13 Oct 2015 00:16:25 +0200 |
Mads Kiilerich |
merge: abort on file/directory case folding collisions (issue4892)
|
| Tue, 13 Oct 2015 00:16:25 +0200 |
Mads Kiilerich |
tests: test of case-folding merge collisions
|
| Wed, 19 Aug 2015 15:40:13 -0500 |
Matt Mackall |
copies: group bothnew with other sets
|
| Wed, 19 Aug 2015 15:32:27 -0500 |
Matt Mackall |
copies: rename renamedelete to renamedeleteset for clarity
|
| Wed, 19 Aug 2015 15:26:08 -0500 |
Matt Mackall |
copies: move _makegetfctx calls into checkcopies
|
| Wed, 19 Aug 2015 15:17:33 -0500 |
Matt Mackall |
copies: factor out setupctx into _makegetfctx
|
| Fri, 21 Aug 2015 15:12:58 -0500 |
Matt Mackall |
copies: avoid reference to c1/c2 in makectx
|
| Mon, 12 Oct 2015 03:37:09 -0500 |
Matt Mackall |
mq: use cmdutil.revert instead of hg.revert
|
| Wed, 30 Sep 2015 21:48:53 -0700 |
Siddharth Agarwal |
debugmergestate: add support for printing out driver-resolved files
|
| Wed, 30 Sep 2015 21:47:27 -0700 |
Siddharth Agarwal |
debugmergestate: add support for printing out merge driver
|
| Wed, 30 Sep 2015 19:43:51 -0700 |
Siddharth Agarwal |
merge.mergedriver: don't try resolving files marked driver-resolved
|
| Mon, 28 Sep 2015 18:34:06 -0700 |
Siddharth Agarwal |
merge.mergestate: add support for persisting driver-resolved files
|
