Mercurial > hg
graph
-
hgweb: make sure command options are set to all ui objectsSat, 21 Nov 2015 13:28:12 +0900, by Yuya Nishihara
-
hgweb: eliminate duck-typing to select hgweb or hgwebdir by command optionSat, 31 Oct 2015 22:26:50 +0900, by Yuya Nishihara
-
addrevision: only use the incoming base if it is a good delta (issue4975)Tue, 01 Dec 2015 16:06:20 -0800, by Pierre-Yves David
-
addrevision: handle code path not producing deltaTue, 01 Dec 2015 16:22:49 -0800, by Pierre-Yves David
-
addrevision: rename 'd' to 'delta'Tue, 01 Dec 2015 15:29:11 -0800, by Pierre-Yves David
-
strip: add a --keep test related to removing files from dirstateMon, 30 Nov 2015 11:23:15 -0800, by Christian Delahousse
-
dirstate: change debugrebuilddirstate --minimal to use dirstate.rebuildMon, 30 Nov 2015 11:23:15 -0800, by Christian Delahousse
-
debugrebuilddirstate: added tests for --minimal flagTue, 01 Dec 2015 10:52:36 -0800, by Christian Delahousse
-
debugdirstate: add command to rebuildstate test to modify dirstateTue, 01 Dec 2015 11:17:14 -0800, by Christian Delahousse
-
graft: improve --continue abort messageWed, 02 Dec 2015 06:33:52 +0000, by timeless
-
summary: mention graftWed, 02 Dec 2015 06:31:12 +0000, by timeless
-
histedit: mention histedit-last-edit.txt on abortWed, 02 Dec 2015 08:07:36 +0000, by timeless
-
histedit: add missing raise keyword to statementWed, 02 Dec 2015 07:40:42 +0000, by timeless
-
histedit: improve grammar for _histedit commentWed, 02 Dec 2015 07:39:49 +0000, by timeless
-
test-fncache: ensure lock doesn't look held to __del__Tue, 01 Dec 2015 14:44:08 -0500, by Augie Fackler
-
commands: inline definition of localrepo.parents() and drop the method (API)Wed, 11 Nov 2015 20:07:15 -0500, by Augie Fackler
-
localrepo: document nodebookmarksWed, 11 Nov 2015 20:02:05 -0500, by Augie Fackler
-
localrepo: remove clone method by hoisting into hg.pyWed, 11 Nov 2015 19:47:49 -0500, by Augie Fackler
-
filemerge: default regular prompts to 'leave unresolved' (BC)Tue, 01 Dec 2015 09:48:38 -0800, by Siddharth Agarwal
-
filemerge: add a 'leave unresolved' option to change/delete promptsMon, 30 Nov 2015 13:43:55 -0800, by Siddharth Agarwal
-
filemerge: add a 'leave unresolved' option to regular promptsMon, 30 Nov 2015 11:17:18 -0800, by Siddharth Agarwal
-
filemerge: add debug output for whether this is a change/delete conflictWed, 25 Nov 2015 14:25:26 -0800, by Siddharth Agarwal
-
webcommands: test that fctx is not None in filediff()Sat, 28 Nov 2015 17:06:29 +0800, by Anton Shestakov
-
webcommands: stop using ersatz if-else ternary operator for rename variableSat, 28 Nov 2015 16:46:31 +0800, by Anton Shestakov
-
webcommands: get correct parents when comparing a removed file (issue4962)Sat, 28 Nov 2015 16:02:22 +0800, by Anton Shestakov
-
repair: use bookmarks.recordchange instead of bookmarks.writeMon, 30 Nov 2015 16:38:29 -0800, by Laurent Charignon
-
commit: add amend mode for commit -iMon, 30 Nov 2015 16:37:42 -0800, by Laurent Charignon
-
commit: add a way to return more information from the chunkselectorMon, 30 Nov 2015 16:35:21 -0800, by Laurent Charignon
-
histedit: edit with custom filenameSat, 21 Nov 2015 17:40:26 +0200, by Mykola Nikishov
-
ui: allow open editor with custom filenameSat, 21 Nov 2015 22:04:09 +0200, by Mykola Nikishov
-
help: make help deprecated mention the extensionMon, 30 Nov 2015 20:45:07 +0000, by timeless
-
help: make listexts less confusing for deprecated extsMon, 30 Nov 2015 20:44:22 +0000, by timeless
-
patchbomb: rename email functionSun, 29 Nov 2015 06:51:23 +0000, by timeless
-
graphlog: rename glog functionSun, 29 Nov 2015 06:51:23 +0000, by timeless
-
commit: preserve extra when amending with commit --amendSat, 28 Nov 2015 04:11:57 -0500, by Mike Edgar
-
graft: copy extra (except branch) when copying changesetsSat, 28 Nov 2015 04:11:38 -0500, by Mike Edgar
-
rebase: propagate extra dict from rebase source changesetSat, 28 Nov 2015 04:11:14 -0500, by Mike Edgar
-
histedit: add examplesWed, 25 Nov 2015 18:26:48 +0100, by Mathias De Maré
-
commands: add examples for 'addremove'Wed, 25 Nov 2015 18:10:59 +0100, by Mathias De Maré
-
commands: add example for 'hg add'Wed, 25 Nov 2015 18:10:31 +0100, by Mathias De Maré
-
extensions: refuse to load extensions if minimum hg version not metTue, 24 Nov 2015 15:16:25 -0800, by Gregory Szorc
-
run-tests: add --slowtimeout and use it for slow testsWed, 25 Nov 2015 00:39:05 +0000, by timeless
-
serve: unify cmdutil.service() calls of commandserver and hgwebSat, 31 Oct 2015 22:17:05 +0900, by Yuya Nishihara
-
hgweb: extract factory function of httpservice objectSat, 31 Oct 2015 22:15:16 +0900, by Yuya Nishihara
-
hgweb: move httpservice object from commands moduleSat, 31 Oct 2015 21:57:45 +0900, by Yuya Nishihara
-
merge: move almost all change/delete conflicts to resolve phase (BC) (API)Wed, 25 Nov 2015 14:25:33 -0800, by Siddharth Agarwal
-
test-merge-changedelete.t: print out debugmergestateWed, 25 Nov 2015 14:26:46 -0800, by Siddharth Agarwal
-
debugmergestate: also recognize change/delete conflicts in the merge stateTue, 24 Nov 2015 18:26:21 -0800, by Siddharth Agarwal
-
debugmergestate: print out null nodes as 'null'Mon, 30 Nov 2015 10:26:37 -0800, by Siddharth Agarwal
-
test-merge-force.t: check .orig files separatelyTue, 24 Nov 2015 15:03:00 -0800, by Siddharth Agarwal
-
merge.recordupdates: mark 'a' files as added unconditionallyTue, 24 Nov 2015 15:26:51 -0800, by Siddharth Agarwal
-
merge: add a new action type representing files to add/mark as modifiedMon, 30 Nov 2015 10:19:39 -0800, by Siddharth Agarwal
-
mergestate: add a cached property accessor for the local contextMon, 30 Nov 2015 10:03:21 -0800, by Siddharth Agarwal
-
mergestate: raise exception if otherctx is accessed but _other isn't setMon, 30 Nov 2015 10:05:09 -0800, by Siddharth Agarwal
-
pager: improve help for --pager=Mon, 30 Nov 2015 18:47:33 +0000, by timeless
-
setup: remove unused py_modules argument to setup()Tue, 24 Nov 2015 21:17:26 -0800, by Gregory Szorc
-
test-merge-changedelete.t: add resolve --list outputMon, 23 Nov 2015 13:45:56 -0800, by Siddharth Agarwal
-
test-merge-changedelete.t: add a file with regular merge conflictsMon, 23 Nov 2015 13:43:14 -0800, by Siddharth Agarwal
-
filemerge: in ':prompt', use ':fail' tool rather than returning directlyTue, 24 Nov 2015 10:58:35 -0800, by Siddharth Agarwal
-
filemerge: in ':fail' tool, write out other side if local side is deletedTue, 24 Nov 2015 10:57:01 -0800, by Siddharth Agarwal
-
mergestate: explicitly forget 'dc' conflicts where the deleted side is pickedMon, 23 Nov 2015 18:03:25 -0800, by Siddharth Agarwal
-
merge.applyupdates: add all actions returned from merge stateMon, 23 Nov 2015 19:06:15 -0800, by Siddharth Agarwal
-
identify: refer to log to be able to view full hashesFri, 27 Nov 2015 20:23:23 +0100, by Mathias De Maré
-
log: add 'hg log' example for full hashesFri, 27 Nov 2015 20:23:02 +0100, by Mathias De Maré
-
backout: add examples to clarify basic usageFri, 02 Oct 2015 07:48:23 +0200, by Mathias De Maré
-
gpg: rename sigcheck functionWed, 25 Nov 2015 06:10:54 +0000, by timeless
-
extensions: properly mark progress as part of coreTue, 24 Nov 2015 18:40:16 -0500, by Augie Fackler
-
test-help: don't use progress extension for the test of argument parsingFri, 27 Nov 2015 23:10:48 +0900, by Yuya Nishihara
-
hghave.py: fix matchoutput documentationTue, 24 Nov 2015 22:31:56 +0000, by timeless
-
dispatch: use versiontuple()Tue, 24 Nov 2015 14:23:46 -0800, by Gregory Szorc
-
util: add versiontuple() for returning parsed version informationTue, 24 Nov 2015 14:23:51 -0800, by Gregory Szorc
-
extensions: rename _ignore to _builtin, add descriptive commentTue, 24 Nov 2015 16:38:54 -0800, by Bryan O'Sullivan
-
ui: avoid needless casting to a strSun, 22 Nov 2015 14:44:55 -0800, by Gregory Szorc
-
ui: remove labeled argument from popbufferTue, 24 Nov 2015 11:23:10 -0800, by Gregory Szorc
-
color: evaluate labels at write timeSun, 22 Nov 2015 14:18:42 -0800, by Gregory Szorc
-
cmdutil: pass labeled=True to pushbuffer()Sun, 22 Nov 2015 14:13:25 -0800, by Gregory Szorc
-
ui: track label expansion when creating buffersSun, 22 Nov 2015 14:10:48 -0800, by Gregory Szorc
-
docker: match more version of 'hg docker version' (issue4967) stable 3.6.2Tue, 24 Nov 2015 18:13:25 -0800, by Pierre-Yves David
-
localrepo.commit: check all files for resolve state (issue4972) stableMon, 30 Nov 2015 16:31:28 -0800, by Siddharth Agarwal
-
test-contrib-perf: add smoke tests for perf.pyTue, 24 Nov 2015 21:41:12 +0000, by timeless
-
contrib/perf: perfparents handle filtered reposTue, 24 Nov 2015 21:36:20 +0000, by timeless
-
contrib/perf: perfparents handle tiny reposTue, 24 Nov 2015 20:54:14 +0000, by timeless
-
contrib/perf: fix perfmergecalculateTue, 24 Nov 2015 21:44:16 +0000, by timeless
-
contrib/perf: fix perffncachewriteTue, 24 Nov 2015 22:01:11 +0000, by timeless
-
contrib/perf: omit duplicated functionTue, 24 Nov 2015 20:05:15 +0000, by timeless
-
contrib/perf: name functions to match decoratorsTue, 24 Nov 2015 20:08:21 +0000, by timeless
-
hghave.py: remove execute bitTue, 24 Nov 2015 22:26:43 +0000, by timeless
-
format: create new repository as 'generaldelta' by defaultMon, 02 Nov 2015 17:33:18 +0000, by Pierre-Yves David
-
shelve: use colon instead of quotes in 'changes to' descriptionSun, 22 Nov 2015 21:40:23 -0800, by Siddharth Agarwal
-
merge.applyupdates: create absentfilectxes for change/delete conflictsSun, 22 Nov 2015 21:58:28 -0800, by Siddharth Agarwal
-
mergestate: add methods to queue files to remove, add or getSun, 22 Nov 2015 21:59:52 -0800, by Siddharth Agarwal
-
resolve: record dirstate actions after performing resolutionsSun, 15 Nov 2015 21:27:22 -0800, by Siddharth Agarwal
-
mergestate: add a way to record pending dirstate actionsFri, 20 Nov 2015 16:55:01 -0800, by Siddharth Agarwal
-
merge.recordupdates: don't require action keys to be present in dictSun, 15 Nov 2015 21:55:46 -0800, by Siddharth Agarwal
-
histedit: constant-ify the constraints listMon, 23 Nov 2015 10:13:05 -0500, by Augie Fackler
-
histedit: add an experimental base actionTue, 17 Nov 2015 15:04:31 -0800, by Mateusz Kwapich
-
histedit: add abortdirty functionTue, 17 Nov 2015 17:53:52 -0800, by Mateusz Kwapich
-
histedit: add forceother constraintThu, 12 Nov 2015 16:40:33 -0800, by Mateusz Kwapich
-
histedit: make verification configurableTue, 17 Nov 2015 16:37:26 -0800, by Mateusz Kwapich
-
paper: show current revision on file log pageFri, 13 Nov 2015 18:31:58 +0800, by Anton Shestakov
-
merge.applyupdates: extend action queues with ones returned from mergestateFri, 20 Nov 2015 11:26:31 -0800, by Siddharth Agarwal
-
mergestate: add a method to compute actions to perform on dirstateFri, 20 Nov 2015 16:43:25 -0800, by Siddharth Agarwal
-
merge.applyupdates: use counters from mergestateFri, 20 Nov 2015 16:37:39 -0800, by Siddharth Agarwal
-
mergestate: add a function to return the number of unresolved filesFri, 20 Nov 2015 16:18:51 -0800, by Siddharth Agarwal
-
mergestate: add a method to return updated/merged/removed countsFri, 20 Nov 2015 16:17:54 -0800, by Siddharth Agarwal
-
mergestate._resolve: don't return the action any moreFri, 20 Nov 2015 16:32:47 -0800, by Siddharth Agarwal
-
mergestate._resolve: store return code and action for each fileFri, 20 Nov 2015 16:08:22 -0800, by Siddharth Agarwal
-
revsetbenchmarks: support benchmarking changectx loadingSat, 21 Nov 2015 15:43:04 -0800, by Gregory Szorc
-
perf: support obtaining contexts from perfrevsetSat, 21 Nov 2015 15:39:18 -0800, by Gregory Szorc
-
localrepo: improve docstring for revset methodsSat, 21 Nov 2015 11:07:30 -0800, by Gregory Szorc
-
revlog: improve documentationSun, 22 Nov 2015 16:23:20 -0800, by Gregory Szorc
-
demandimport: don't enable when running under PyPySat, 21 Nov 2015 22:28:01 -0800, by Gregory Szorc
-
ui.write: don't clear progress bar when writing to a bufferSat, 14 Nov 2015 17:14:14 -0800, by Gregory Szorc
-
test-resolve: fix '--tool f' invocation for WindowsSun, 22 Nov 2015 21:20:08 -0500, by Matt Harbison
-
util.datestr: use divmod()Sat, 14 Nov 2015 17:30:10 -0800, by Gregory Szorc
-
cmdutil.changeset_printer: pass context into showpatch()Sat, 14 Nov 2015 17:44:01 -0800, by Gregory Szorc
-
context: avoid extra parents lookupsSat, 21 Nov 2015 19:21:01 -0800, by Gregory Szorc
-
context: optimize _parents()Sat, 21 Nov 2015 19:04:12 -0800, by Gregory Szorc
-
test-histedit: $TESTTMP quoting fixes for WindowsSun, 22 Nov 2015 13:05:21 -0500, by Matt Harbison
-
lsprof: support PyPy (issue4573)Sat, 21 Nov 2015 23:26:22 -0800, by Gregory Szorc
-
base85: clean up function definition styleWed, 11 Nov 2015 19:10:45 -0500, by Augie Fackler
-
rebase: use bookmarks.recordchange instead of bookmarks.writeFri, 20 Nov 2015 14:06:31 -0800, by Laurent Charignon
-
rebase: indentation change to make the next patch more legibleFri, 20 Nov 2015 11:36:05 -0800, by Laurent Charignon
-
test-run-tests: conditionalize the $TESTDIR check for Windows separatorMon, 16 Nov 2015 16:56:00 -0500, by Matt Harbison
-
test-context: conditionalize the workingfilectx date printing for WindowsMon, 09 Nov 2015 17:15:36 -0500, by Matt Harbison
-
test-mq-qrefresh: drop single quoting of HGEDITOR value for WindowsMon, 16 Nov 2015 14:37:03 -0500, by Matt Harbison
-
test-import: don't use printf to append an extension to $HGRCPATHMon, 16 Nov 2015 14:12:27 -0500, by Matt Harbison
-
test-ssh: stop quoting dummyssh invocation for WindowsMon, 16 Nov 2015 13:44:27 -0500, by Matt Harbison
-
strip: use repo._bookmarks.recordchange instead of repo._bookmarks.writeFri, 20 Nov 2015 13:46:36 -0800, by Laurent Charignon
-
histedit: make use of bookmarks.recordchange instead of bookmarks.writeFri, 20 Nov 2015 13:23:47 -0800, by Laurent Charignon
-
largefiles: fall back to the original for change/delete conflictsWed, 18 Nov 2015 17:40:13 -0800, by Siddharth Agarwal
-
mergestate.add: store absentfilectxes as nullhexSat, 14 Nov 2015 00:07:11 -0800, by Siddharth Agarwal
-
mergestate._resolve: handle change/delete conflictsFri, 20 Nov 2015 01:14:15 -0800, by Siddharth Agarwal
-
filemerge: don't try to copy files known to be absentSat, 14 Nov 2015 00:00:46 -0800, by Siddharth Agarwal
-
hgweb: use absolute_importSat, 31 Oct 2015 22:07:40 +0900, by Yuya Nishihara
-
hgweb: import wsgicgi at top levelSun, 01 Nov 2015 15:09:35 +0900, by Yuya Nishihara
-
hgweb: import BaseHTTPServer as module at top levelSun, 01 Nov 2015 15:07:08 +0900, by Yuya Nishihara
-
hgweb: do not import hgweb_mod.hgweb and .makebreadcrumb as symbolSun, 01 Nov 2015 14:23:23 +0900, by Yuya Nishihara
-
filemerge: don't try using external tools on change/delete conflictsFri, 13 Nov 2015 23:57:43 -0800, by Siddharth Agarwal
-
filemerge: don't attempt to premerge change/delete conflictsFri, 13 Nov 2015 23:56:00 -0800, by Siddharth Agarwal
-
filemerge._mergecheck: add check for change/delete conflictsFri, 13 Nov 2015 23:58:05 -0800, by Siddharth Agarwal
-
filemerge._picktool: only pick from nomerge tools for change/delete conflictsSun, 15 Nov 2015 21:40:15 -0800, by Siddharth Agarwal
-
filemerge: add support for change/delete conflicts to the ':prompt' toolFri, 13 Nov 2015 23:52:26 -0800, by Siddharth Agarwal
-
filemerge: add support for change/delete conflicts to the ':other' merge toolWed, 18 Nov 2015 15:41:50 -0800, by Siddharth Agarwal
-
filemerge: add support for change/delete conflicts to the ':local' merge toolWed, 18 Nov 2015 15:40:28 -0800, by Siddharth Agarwal
-
merge.mergestate: compute dirstate actionThu, 19 Nov 2015 10:50:02 -0800, by Siddharth Agarwal
-
filemerge: return whether the file was deletedWed, 18 Nov 2015 14:22:52 -0800, by Siddharth Agarwal
-
filemerge: return whether the file is deleted from all other merge toolsWed, 18 Nov 2015 13:55:31 -0800, by Siddharth Agarwal
-
filemerge: return whether the file is deleted for nomerge internal toolsWed, 18 Nov 2015 13:52:28 -0800, by Siddharth Agarwal
-
mergestate: allow storing and retrieving change/delete conflictsWed, 18 Nov 2015 15:46:45 -0800, by Siddharth Agarwal
-
strip: changing bookmark argument to be a listThu, 19 Nov 2015 12:50:10 +0530, by Shubhanshu Agrawal
-
strip: strip a list of bookmarksSun, 15 Nov 2015 21:03:44 +0530, by Shubhanshu Agrawal
-
revset: speed up '_matchfiles'Wed, 18 Nov 2015 23:23:03 -0800, by Pierre-Yves David
-
mergestate: handle additional record types speciallyWed, 18 Nov 2015 15:46:45 -0800, by Siddharth Agarwal
-
test-resolve.t: remove completely unnecessary lineWed, 18 Nov 2015 23:42:32 -0800, by Siddharth Agarwal
-
resolve: fix incorrect mergeWed, 18 Nov 2015 23:43:18 -0800, by Siddharth Agarwal
-
fileset: add missing() predicate (issue4925)Wed, 18 Nov 2015 20:55:32 +0100, by liscju
-
webutil: make _siblings into an object with __iter__ and __len__Tue, 10 Nov 2015 17:22:40 +0800, by Anton Shestakov
-
mergestate: move binary format documentation into _readrecordsv2Wed, 18 Nov 2015 16:39:30 -0800, by Siddharth Agarwal
-
unshelve: add support for custom merge toolsWed, 18 Nov 2015 15:11:23 -0800, by Siddharth Agarwal
-
unshelve: shed spurious spaceWed, 18 Nov 2015 15:18:16 -0800, by Siddharth Agarwal
-
unshelve: add -k as short form of --keepWed, 18 Nov 2015 15:04:03 -0800, by Siddharth Agarwal
-
import-checker: allow symbol imports from hgweb.common and .requestSun, 01 Nov 2015 13:55:21 +0900, by Yuya Nishihara
-
perf: un-bitrot perfstatusThu, 19 Nov 2015 15:02:27 -0600, by Matt Mackall
-
util: drop statmtimesecThu, 19 Nov 2015 13:15:17 -0600, by Matt Mackall
-
util: disable floating point stat times (issue4836)Thu, 19 Nov 2015 13:21:24 -0600, by Matt Mackall
-
rebase: refactoring to avoid repetition of expressionWed, 18 Nov 2015 15:58:06 -0800, by Laurent Charignon
-
rebase: remove an unused todoWed, 18 Nov 2015 16:06:00 -0800, by Laurent Charignon
-
rebase: don't rebase obsolete commits with no successorWed, 18 Nov 2015 13:44:29 -0800, by Laurent Charignon
-
rebase: fix a typo in test-rebase-obsoleteWed, 18 Nov 2015 13:46:42 -0800, by Laurent Charignon
-
merge with stableWed, 18 Nov 2015 20:59:17 -0600, by Matt Mackall
-
hgweb: unify import style of error classesSun, 01 Nov 2015 14:43:25 +0900, by Yuya Nishihara
-
hgweb: do not import templatefilters.revescape and websub as symbolSun, 01 Nov 2015 14:00:14 +0900, by Yuya Nishihara
-
hgweb: alias ui module as uimodSun, 01 Nov 2015 13:58:32 +0900, by Yuya Nishihara
-
mergestate.commit: factor out making the list of recordsTue, 17 Nov 2015 14:23:26 -0800, by Siddharth Agarwal
-
mergestate: move _read() call to read constructorTue, 17 Nov 2015 14:04:56 -0800, by Siddharth Agarwal
-
debugmergestate: explain why we create mergestate objects directlyTue, 17 Nov 2015 14:22:30 -0800, by Siddharth Agarwal
-
debugdirstate: convert keyword parameters to **optsWed, 11 Nov 2015 13:28:00 -0800, by Christian Delahousse
-
convert: changed test's progress output format to ignore estimateTue, 17 Nov 2015 18:01:21 -0800, by Christian Delahousse
-
mq: use repo._bookmarks.recordchange instead of repo._bookmarks.writeTue, 17 Nov 2015 13:12:33 -0800, by Laurent Charignon
-
mq: indentation change to make the next patch more legibleTue, 17 Nov 2015 13:12:46 -0800, by Laurent Charignon
-
bookmarks: use repo._bookmarks.recordchange instead of repo._bookmarks.writeTue, 17 Nov 2015 12:49:57 -0800, by Laurent Charignon
-
localrepo: put bookmark move following commit in one transactionWed, 18 Nov 2015 01:36:58 -0800, by Laurent Charignon
-
test-resolve.t: switch to mergestate.read()Tue, 17 Nov 2015 15:43:21 -0800, by Siddharth Agarwal
-
localrepo.commit: switch to mergestate.read()Tue, 17 Nov 2015 13:58:50 -0800, by Siddharth Agarwal
-
fileset: switch to mergestate.read()Tue, 17 Nov 2015 13:57:38 -0800, by Siddharth Agarwal
-
commands.summary: switch to mergestate.read()Tue, 17 Nov 2015 14:20:55 -0800, by Siddharth Agarwal
-
commands.resolve: switch to mergestate.read()Tue, 17 Nov 2015 13:56:46 -0800, by Siddharth Agarwal
-
shelve: switch to mergestate.read()Tue, 17 Nov 2015 13:56:10 -0800, by Siddharth Agarwal
-
mergestate: add a constructor that reads state from diskTue, 17 Nov 2015 13:55:30 -0800, by Siddharth Agarwal
-
merge.applyupdates: switch to mergestate.clean()Tue, 17 Nov 2015 17:04:53 -0800, by Siddharth Agarwal
-
localrepo: switch to mergestate.clean()Tue, 17 Nov 2015 17:04:32 -0800, by Siddharth Agarwal
-
strip: switch to mergestate.clean()Tue, 17 Nov 2015 17:02:35 -0800, by Siddharth Agarwal
-
mergestate: add a constructor that sets up a clean merge stateTue, 17 Nov 2015 17:00:54 -0800, by Siddharth Agarwal
-
mergestate: raise structured exception for unsupported merge recordsTue, 17 Nov 2015 14:11:52 -0800, by Siddharth Agarwal
-
error: add a structured exception for unsupported merge recordsTue, 17 Nov 2015 14:10:12 -0800, by Siddharth Agarwal
-
dirstate: back out 502b56a9e897Tue, 17 Nov 2015 13:47:16 -0800, by Bryan O'Sullivan
-
osutil: make statfiles check for interrupts periodicallyTue, 17 Nov 2015 13:47:14 -0800, by Bryan O'Sullivan
-
osutil: don't leak on statfiles errorTue, 17 Nov 2015 13:43:09 -0800, by Bryan O'Sullivan
-
histedit: extracts _isdirtywc functionThu, 12 Nov 2015 12:44:15 +0100, by liscju
-
node: add 'nullhex', hex-encoded nullidMon, 16 Nov 2015 11:23:32 -0800, by Siddharth Agarwal
-
filemerge: introduce class whose objects represent files not in a contextMon, 16 Nov 2015 11:45:35 -0800, by Siddharth Agarwal
-
filectx: add isabsent methodMon, 16 Nov 2015 11:27:27 -0800, by Siddharth Agarwal
-
filectx: allow custom comparatorsFri, 13 Nov 2015 22:37:51 -0800, by Siddharth Agarwal
-
debugmergestate: print out record type for filesFri, 13 Nov 2015 23:01:36 -0800, by Siddharth Agarwal
-
merge.applyupdates: don't return early if merge driver's conclude failedSun, 15 Nov 2015 22:45:20 -0800, by Siddharth Agarwal
-
convert: use repo._bookmarks.recordchange instead of repo._bookmarks.writeMon, 16 Nov 2015 17:15:36 -0800, by Laurent Charignon
-
convert: indentation change to make the next patch more legibleMon, 16 Nov 2015 17:14:15 -0800, by Laurent Charignon
-
strip: renaming local variablesSun, 15 Nov 2015 20:27:27 +0530, by Shubhanshu Agrawal
-
test-rename-merge2: make selected output less arbitraryWed, 11 Feb 2015 22:22:29 -0800, by Martin von Zweigbergk
-
test-convert-git: drop a git warning that doesn't occur on WindowsSun, 15 Nov 2015 22:11:23 -0500, by Matt Harbison
-
tests: fix globs for WindowsSun, 15 Nov 2015 21:12:13 -0500, by Matt Harbison
-
pull: return 255 value on update failure (issue4948) (BC)Sun, 15 Nov 2015 22:58:28 +0100, by liscju
-
filemerge: remove leading space from " no tool found..."Wed, 11 Nov 2015 10:19:11 -0800, by Martin von Zweigbergk
-
test-encoding: enable fuzz testing of utf8b roundtripMon, 09 Nov 2015 22:31:01 +0900, by Yuya Nishihara
-
import-checker: reset context to verify convention in function scopeSun, 01 Nov 2015 17:42:03 +0900, by Yuya Nishihara
-
import-checker: allow import of child modules from package rootSun, 01 Nov 2015 00:37:22 +0900, by Yuya Nishihara
-
encoding: extend test cases for utf8bMon, 02 Nov 2015 17:17:33 -0600, by Matt Mackall
-
merge: make 'cd' and 'dc' actions store the same arguments as 'm'Fri, 13 Nov 2015 22:43:09 -0800, by Siddharth Agarwal
-
merge: stop emptying out 'cd' and 'dc' actionsFri, 13 Nov 2015 14:24:22 -0800, by Siddharth Agarwal
-
rebase: add returning value from pullrebase function stableSun, 15 Nov 2015 22:18:48 +0100, by liscju
-
resolve: restore .orig only after merge is fully complete (issue4952) stableFri, 13 Nov 2015 15:56:02 -0800, by Siddharth Agarwal
-
monoblue: add a space to separate navigation links in file log footerFri, 06 Nov 2015 22:32:00 +0800, by Anton Shestakov
-
merge: move messages about possible conflicts a litte earlierThu, 12 Nov 2015 13:14:03 -0800, by Martin von Zweigbergk
-
import-checker: include lineno in warning messageSun, 01 Nov 2015 15:46:06 +0900, by Yuya Nishihara
-
import-checker: extract function to generate a formatted warningSun, 01 Nov 2015 15:39:25 +0900, by Yuya Nishihara
-
import-checker: make it executable for convenienceSun, 01 Nov 2015 13:53:05 +0900, by Yuya Nishihara
-
test-fileset: glob the updated file count for Windows stabilityMon, 09 Nov 2015 17:20:50 -0500, by Matt Harbison
-
tests: tolerate differences between Linux and Windows error stringsMon, 09 Nov 2015 13:12:35 -0500, by Matt Harbison
-
test-largefiles-cache: add glob for WindowsMon, 09 Nov 2015 12:51:58 -0500, by Matt Harbison
-
tests: make 'f' tool open files in binary mode when hexdumpingMon, 09 Nov 2015 12:49:31 -0500, by Matt Harbison
-
merge.applyupdates: only attempt to merge files in mergeactionsThu, 12 Nov 2015 14:29:02 -0800, by Siddharth Agarwal
-
filemerge: rename _symlinkcheck to _mergecheckWed, 11 Nov 2015 17:34:28 -0800, by Siddharth Agarwal
-
test-merge-prompt.t: rename to test-merge-changedelete.tWed, 11 Nov 2015 17:32:41 -0800, by Siddharth Agarwal
-
merge with stableThu, 12 Nov 2015 20:48:41 -0600, by Matt Mackall
-
tags: create new sortdict for performance reasons stableThu, 12 Nov 2015 13:16:04 -0800, by Gregory Szorc
-
largefiles: specify where .orig files are keptTue, 10 Nov 2015 15:08:56 -0800, by Christian Delahousse
-
mq: let the user choose where .orig files are keptTue, 10 Nov 2015 14:52:54 -0800, by Christian Delahousse
-
shelve: choose where .orig file locations are keptTue, 10 Nov 2015 14:41:14 -0800, by Christian Delahousse
-
filemerge: choose where .orig files are keptTue, 10 Nov 2015 16:25:59 -0800, by Christian Delahousse
-
git-subrepos: revert respects specified location to save .orig filesTue, 10 Nov 2015 14:29:13 -0800, by Christian Delahousse
-
resolve: choose where .orig file locations are keptTue, 10 Nov 2015 14:26:19 -0800, by Christian Delahousse
-
revert: allow configuring the .orig file locationThu, 12 Nov 2015 17:00:08 -0600, by Christian Delahousse
-
cmdutil: add origbackuppath helperThu, 12 Nov 2015 16:56:06 -0600, by Christian Delahousse
-
discovery: pass pushop to _nowarnheadsTue, 10 Nov 2015 11:16:25 -0800, by Ryan McElroy
-
exchange: pass pushop to discovery.checkheadsTue, 10 Nov 2015 11:13:21 -0800, by Ryan McElroy
-
merge with stableThu, 12 Nov 2015 15:26:30 -0600, by Matt Mackall
-
share: wrap bmstore._writerepo for transaction sensitivity (issue4940) stableFri, 13 Nov 2015 02:36:30 +0900, by FUJIWARA Katsunori
-
test: use generaldelta in 'test-clonebundle.t'Sat, 07 Nov 2015 13:48:42 -0500, by Pierre-Yves David
-
test: use generaldelta in 'test-ssh.t'Tue, 20 Oct 2015 13:14:04 +0200, by Pierre-Yves David
-
test: use generaldelta in 'test-ssh-bundle1.t'Tue, 20 Oct 2015 13:14:31 +0200, by Pierre-Yves David
-
test: use generaldelta in 'test-strip.t'Tue, 20 Oct 2015 13:09:43 +0200, by Pierre-Yves David
-
test: use generaldelta in 'test-rebase-newancestors.t'Tue, 20 Oct 2015 12:39:49 +0200, by Pierre-Yves David
-
test: use general delta for 'test-commit-amend.t'Tue, 20 Oct 2015 12:09:18 +0200, by Pierre-Yves David
-
test: wider matching in 'test-clone-r.t'Tue, 20 Oct 2015 11:50:55 +0200, by Pierre-Yves David
-
test: use generaldelta in 'test-bundle-type.t'Tue, 20 Oct 2015 11:48:49 +0200, by Pierre-Yves David
-
test: use generaldelta in 'test-patchbomb.t'Tue, 20 Oct 2015 10:46:59 +0200, by Pierre-Yves David
-
test: use generaldelta for test-bundle.tTue, 20 Oct 2015 10:37:07 +0200, by Pierre-Yves David
-
test: use generaldelta in 'test-rebase-conflict.t'Tue, 20 Oct 2015 03:14:36 +0200, by Pierre-Yves David
-
tests: test generaldelta configuration in test-init.tMon, 19 Oct 2015 15:25:58 +0200, by Pierre-Yves David
-
test: enable generaldelta early in 'test-treemanifest.t'Mon, 19 Oct 2015 11:28:31 +0200, by Pierre-Yves David
-
test: enable generaldelta in 'test-copy.t'Mon, 19 Oct 2015 10:48:02 +0200, by Pierre-Yves David
-
test: enable generaldelta in 'test-debugcommand.t'Sun, 18 Oct 2015 19:04:29 +0200, by Pierre-Yves David
-
test: use generaldelta in test-manifestv2.tSun, 18 Oct 2015 18:55:32 +0200, by Pierre-Yves David
-
test: explicitly use generaldelta in 'test-rebase-mq-skip.t'Sun, 18 Oct 2015 18:36:39 +0200, by Pierre-Yves David
-
test: using generaldelta in 'test-lfconvert.t'Fri, 16 Oct 2015 02:54:52 +0100, by Pierre-Yves David
-
test: enforce generaldelta format with the right optionThu, 12 Nov 2015 02:52:19 -0800, by Pierre-Yves David
-
test: enforce non-generaldelta base repository in 'test-generaldelta'Sat, 07 Nov 2015 13:53:11 -0500, by Pierre-Yves David
-
test: use generaldelta in 'test-hgweb-command.t'Tue, 20 Oct 2015 12:25:51 +0200, by Pierre-Yves David
-
stream: sort stream capability before serialisationTue, 20 Oct 2015 12:28:42 +0200, by Pierre-Yves David
-
test: spread capabilities replies in 'test-hgweb-commands'Tue, 20 Oct 2015 12:25:09 +0200, by Pierre-Yves David
-
phase: improve retractboundary perfSat, 07 Nov 2015 16:11:49 -0800, by Durham Goode
-
merge with stableThu, 12 Nov 2015 13:51:09 -0600, by Matt Mackall
-
format: introduce 'format.usegeneraldelta`Mon, 02 Nov 2015 15:59:12 +0000, by Pierre-Yves David
-
scmutil: extract general delta config handling in a functionMon, 02 Nov 2015 16:52:34 +0000, by Pierre-Yves David
-
test: test-bundle-type.t needs to work more universally stableTue, 10 Nov 2015 09:58:10 -0800, by Danek Duvall
-
bash_completion: add -p|--patch|--stat support for shelveTue, 10 Nov 2015 19:52:30 +0800, by Anton Shestakov
-
test-convert-git: silence commit output for stablitySun, 08 Nov 2015 18:34:36 -0500, by Matt Harbison
-
rebase: preserve the 'intermediate-source' attribute of graftsSun, 08 Nov 2015 17:56:48 -0500, by Matt Harbison
-
merge with stableWed, 11 Nov 2015 15:08:08 -0600, by Matt Mackall
-
verify: add a hook that can let extensions manipulate file listsWed, 04 Nov 2015 12:14:18 -0500, by Augie Fackler
-
resolve: don't abort when file is missingTue, 10 Nov 2015 17:16:59 -0800, by Siddharth Agarwal
-
filemerge: treat EOF at prompt as fail, not abortTue, 10 Nov 2015 17:13:16 -0800, by Siddharth Agarwal
-
test-merge-tools.t: add 'hg resolve --list' output to testsTue, 10 Nov 2015 17:10:47 -0800, by Siddharth Agarwal
-
error: add structured exception for EOF at promptTue, 10 Nov 2015 00:46:45 -0800, by Siddharth Agarwal
-
test-merge-prompt.t: unset HGMERGEMon, 09 Nov 2015 22:37:32 -0800, by Siddharth Agarwal
-
hgweb: compute changeset parents and children for log pages lazilyTue, 10 Nov 2015 23:02:59 +0800, by Anton Shestakov
-
filemerge: move :merge-local/other symlink check to precheckSun, 08 Nov 2015 23:42:44 -0800, by Siddharth Agarwal
-
test-merge-types.t: add tests for :merge-local/:merge-other with symlinksSun, 08 Nov 2015 23:47:20 -0800, by Siddharth Agarwal
-
posix: fix test-permissions regression stable 3.6.1Mon, 09 Nov 2015 15:53:11 -0600, by Matt Mackall
-
dockerlib: allow non-unique uid and gid of $DBUILDUSER (issue4657) stableSun, 08 Nov 2015 01:10:52 +0800, by Anton Shestakov
-
dirstate: fix filefoldmap incosistency on file delete stableMon, 09 Nov 2015 10:43:23 -0800, by Mateusz Kwapich
-
merge with stableMon, 09 Nov 2015 12:49:21 -0600, by Matt Mackall
-
changegroup: back code change of e7c618cee8df out stableFri, 06 Nov 2015 13:01:15 -0500, by Pierre-Yves David
-
changegroup: call 'prechangegroup' hook before setting up write delay stableFri, 06 Nov 2015 12:59:09 -0500, by Pierre-Yves David
-
changegroup: fix the scope of a try finally stableFri, 06 Nov 2015 12:39:06 -0500, by Pierre-Yves David
-
encoding: re-escape U+DCxx characters in toutf8b input (issue4927)Thu, 05 Nov 2015 17:30:10 -0600, by Matt Mackall
-
encoding: use getutf8char in toutf8bThu, 05 Nov 2015 17:21:43 -0600, by Matt Mackall
-
encoding: handle non-BMP characters in fromutf8bThu, 05 Nov 2015 17:11:50 -0600, by Matt Mackall
-
posix: use getutf8char to handle OS X filename percent-escapingThu, 05 Nov 2015 17:09:00 -0600, by Matt Mackall
-
encoding: add getutf8char helperThu, 05 Nov 2015 16:48:46 -0600, by Matt Mackall
-
unbundle: gratuitous fix white spacing "issue"Sat, 07 Nov 2015 16:03:09 -0500, by Pierre-Yves David
-
demandimport: fix level passed to loader of sub-modules stableSun, 01 Nov 2015 21:19:09 +0900, by Yuya Nishihara
-
parsers: fix width of datalen variable in fm1readmarkers stableSat, 07 Nov 2015 17:43:20 +0900, by Yuya Nishihara
-
manifest: skip fastdelta if the change is largeThu, 05 Nov 2015 18:56:40 -0800, by Durham Goode
-
merge.mergestate: update docstrings for preresolve and resolveWed, 04 Nov 2015 23:44:51 -0800, by Siddharth Agarwal
-
rebase: pass date parameter to concludenodeMon, 26 Oct 2015 02:35:48 -0700, by Stanislau Hlebik
-
rebase: add date parameter to concludenode functionMon, 26 Oct 2015 02:22:26 -0700, by Stanislau Hlebik
-
hgweb: remove unused colorPart() from mercurial.jsSat, 24 Oct 2015 09:47:33 +0100, by Anton Shestakov
-
test: enforce non-general delta in 'test-generaldelta.t'Sun, 18 Oct 2015 18:49:59 +0200, by Pierre-Yves David
-
test: enforce bundle1 in 'test-push-cgi.t'Tue, 20 Oct 2015 15:27:56 +0200, by Pierre-Yves David
-
test: enforce v1 in 'test-debugbundle.t'Sun, 18 Oct 2015 18:42:09 +0200, by Pierre-Yves David
-
test: enforce bundle1 in "test-commit-interactive.t"Tue, 20 Oct 2015 02:39:42 +0200, by Pierre-Yves David
-
discovery: factor out calculation of heads to not warn aboutFri, 06 Nov 2015 09:48:24 -0800, by Ryan McElroy
-
merge with stableWed, 04 Nov 2015 15:17:52 -0600, by Matt Mackall
-
hooks: fix hooks not firing if prechangegroup was set (issue4934) stableTue, 03 Nov 2015 17:13:27 -0800, by Durham Goode
-
wireproto: move clonebundles command from extension (issue4931) stableTue, 03 Nov 2015 12:31:33 -0800, by Gregory Szorc
-
templatefilters: try round-trip utf-8 conversion by json filter (issue4933) stableWed, 04 Nov 2015 23:48:15 +0900, by Yuya Nishihara
-
exchange: do not attempt clone bundle if local repo is non-empty (issue4932) stableTue, 03 Nov 2015 12:16:54 -0800, by Gregory Szorc
-
test-clonebundles.t: add test for incremental pull stableTue, 03 Nov 2015 12:15:14 -0800, by Gregory Szorc
-
i18n: make sure to include translation of (DEPRECATED) stableTue, 03 Nov 2015 22:44:57 +0900, by Yuya Nishihara
-
i18n: do not abuse msgstr of "DEPRECATED" to check for bad translation stableTue, 03 Nov 2015 22:39:26 +0900, by Yuya Nishihara
-
filemerge.prompt: separate out choice selection and actionMon, 02 Nov 2015 12:12:24 -0800, by Siddharth Agarwal
-
test-merge-prompt.t: add tests for linear updates + change/delete conflictsMon, 02 Nov 2015 12:25:15 -0800, by Siddharth Agarwal
-
test-pathencode.py: drop support for Python 2.4Sat, 24 Oct 2015 16:25:16 -0700, by Siddharth Agarwal
-
hgweb.server: drop support for Python 2.4Sat, 24 Oct 2015 16:23:42 -0700, by Siddharth Agarwal
-
util: drop Python 2.4 compat by directly importing md5 and sha1Sat, 24 Oct 2015 15:56:16 -0700, by Siddharth Agarwal
-
hgweb: replace some str.split() calls by str.partition() or str.rpartition()Mon, 02 Nov 2015 23:37:49 +0800, by Anton Shestakov
-
help: replace some str.split() calls by str.partition() or str.rpartition()Mon, 02 Nov 2015 23:37:14 +0800, by Anton Shestakov
-
convert: test clean p2 file missingSat, 24 Oct 2015 01:54:46 +0200, by Mads Kiilerich
-
uescape: also encode non-printable char under 128Mon, 02 Nov 2015 11:56:59 +0000, by Pierre-Yves David
-
testing: add hypothesis fuzz testingSat, 24 Oct 2015 12:46:03 +0100, by David R. MacIver
-
merge with stableMon, 02 Nov 2015 13:00:45 +0000, by Pierre-Yves David
-
i18n: look translation of both "DEPRECATED" and "(DEPRECATED)" up stable 3.6Sun, 01 Nov 2015 08:38:56 +0900, by FUJIWARA Katsunori
-
i18n: fix regexp pattern to detect translation for DEPRECATED stableSun, 01 Nov 2015 08:38:56 +0900, by FUJIWARA Katsunori
-
scmutil: abort if an empty revision is given to revpair() stableSat, 31 Oct 2015 21:45:46 -0400, by Matt Harbison
-
i18n-ja: synchronized with 6474b64045fb stableSun, 01 Nov 2015 05:34:27 +0900, by FUJIWARA Katsunori
-
packaging: rework version detection and declaration (issue4912) stableMon, 26 Oct 2015 14:19:37 -0400, by Augie Fackler
-
hgweb: escape class keyword when used as a js object property (issue4913) stableTue, 27 Oct 2015 12:34:05 +0800, by Anton Shestakov
-
localrepo: discard objects in _filecache at transaction failure (issue4876) stableSat, 24 Oct 2015 18:58:57 +0900, by FUJIWARA Katsunori
-
demandimport: fix TypeError when importing Python regex library (issue4920) stableWed, 28 Oct 2015 16:27:09 +0100, by Gábor Stefanik
-
bundle2: attribute remote failures to remote (issue4788) stableSat, 24 Oct 2015 00:39:22 +0100, by Gregory Szorc
-
tests: add tests for remote hook output (issue4788) stableSat, 24 Oct 2015 00:39:26 +0100, by Gregory Szorc
-
help: mention alias and revsetalias in description of HGPLAINEXCEPT stableSat, 24 Oct 2015 06:59:26 +0100, by Yuya Nishihara
-
largefiles: don't mute and obfuscate http errors when putlfile fails stableFri, 23 Oct 2015 21:27:29 +0200, by Mads Kiilerich
-
largefiles: test coverage of error handling from putlfile stableFri, 23 Oct 2015 21:27:29 +0200, by Mads Kiilerich
-
largefiles: check hash of files in the store before copying to working dir stableFri, 23 Oct 2015 21:27:29 +0200, by Mads Kiilerich
-
largefiles: test coverage of handling of store corruption stableFri, 23 Oct 2015 21:27:29 +0200, by Mads Kiilerich
-
merge: improve clarity of table in update docstring stableFri, 23 Oct 2015 06:06:22 -0400, by Augie Fackler
-
ui: support paths.default-push without paths.default set (issue4914) stableThu, 22 Oct 2015 18:59:03 +0000, by Gregory Szorc
-
bookmarks: don't allow pushing new head for existing mark with -B (issue4400) stableWed, 21 Oct 2015 16:21:27 -0500, by Matt Mackall
-
largefiles: fix explicit commit of normal/largefile switch stableWed, 21 Oct 2015 00:18:11 +0200, by Mads Kiilerich
-
largefiles: test coverage of explicit commit of normal/largefile switch stableWed, 21 Oct 2015 00:10:46 +0200, by Mads Kiilerich
-
merge default into stable for code freeze stable 3.6-rcTue, 20 Oct 2015 15:59:10 -0500, by Matt Mackall
-
convert: fix Python syntax in 'splice in' messageMon, 19 Oct 2015 16:49:54 +0200, by Mads Kiilerich
-
rebase: fix wrong 'no changes to commit' when using --collapseMon, 19 Oct 2015 16:29:35 +0200, by Mads Kiilerich
-
pull: all pass along extra opargsMon, 19 Oct 2015 15:47:40 -0700, by Sean Farley
-
push: all pass along opargsMon, 19 Oct 2015 15:43:35 -0700, by Sean Farley
-
check-code: allow argument passing py2.6ismThu, 15 Oct 2015 17:28:26 -0400, by timeless
-
mail: drop python 2.5 self.sock.read workaroundThu, 15 Oct 2015 17:24:42 -0400, by timeless
-
url: drop support for python2.5Thu, 15 Oct 2015 17:21:08 -0400, by timeless
-
win32: drop reference to python2.5Thu, 15 Oct 2015 17:19:11 -0400, by timeless
-
editmerge: dequote other use of $EDMon, 19 Oct 2015 21:36:12 -0700, by Ryan McElroy
-
bundlerepo: properly extract compressed changegroup from bundle2Mon, 19 Oct 2015 16:01:55 +0200, by Pierre-Yves David
-
bundle2: make unbundle.compressed return True when compressedFri, 02 Oct 2015 23:21:39 -0700, by Pierre-Yves David
-
bundlerepo: uncompress changegroup in bundle1 case onlyMon, 19 Oct 2015 18:04:08 +0200, by Pierre-Yves David
-
bundlerepo: move temp-bundle writing logic into a closureMon, 19 Oct 2015 17:58:04 +0200, by Pierre-Yves David
-
shelve: properly process bundle2 bundleMon, 19 Oct 2015 15:42:50 +0200, by Pierre-Yves David
-
histedit: properly apply bundle2 backupsTue, 20 Oct 2015 03:07:23 +0200, by Pierre-Yves David
-
strip: pass source and url to bundle2 processingTue, 20 Oct 2015 16:01:33 +0200, by Pierre-Yves David
-
unbundle: use 'url' argument with applybundleTue, 20 Oct 2015 15:56:22 +0200, by Pierre-Yves David
-
applybundle: take url as argumentTue, 20 Oct 2015 15:55:04 +0200, by Pierre-Yves David
-
unbundle: use 'source' argument with applybundleTue, 20 Oct 2015 15:53:07 +0200, by Pierre-Yves David
-
applybundle: take source as argumentTue, 20 Oct 2015 15:52:42 +0200, by Pierre-Yves David
-
applybundle: set 'bundle2=1' env for all transactionTue, 20 Oct 2015 15:48:24 +0200, by Pierre-Yves David
-
unbundle: use 'bundle2.applybundle'Tue, 20 Oct 2015 15:47:20 +0200, by Pierre-Yves David
-
bundle2: introduce an "applybundle" functionTue, 20 Oct 2015 15:45:39 +0200, by Pierre-Yves David
-
commands.resolve: conclude merge driver if no unresolved files are leftThu, 15 Oct 2015 01:31:04 -0700, by Siddharth Agarwal
-
commands.resolve: call driverpreprocess if we haven't run it yetThu, 15 Oct 2015 01:27:06 -0700, by Siddharth Agarwal
-
merge.applyupdates: call driverconclude after performing merge actionsThu, 15 Oct 2015 01:22:01 -0700, by Siddharth Agarwal
-
merge.applyupdates: call driverpreprocess before starting merge actionsThu, 15 Oct 2015 01:19:10 -0700, by Siddharth Agarwal
-
merge: add stubs for preprocess and conclude steps of merge driverThu, 15 Oct 2015 01:17:29 -0700, by Siddharth Agarwal
-
commands.resolve: don't allow users to mark or unmark driver-resolved filesThu, 15 Oct 2015 01:15:22 -0700, by Siddharth Agarwal
-
resolve: only create wctx onceThu, 15 Oct 2015 01:11:50 -0700, by Siddharth Agarwal
-
dirstate: fix invalid reference to self.uiMon, 19 Oct 2015 12:07:17 -0700, by James Mills
-
spelling: trivial spell checkingSat, 17 Oct 2015 00:58:46 +0200, by Mads Kiilerich
-
mq: consistently use qrefreshWed, 14 Oct 2015 03:30:27 -0400, by timeless
-
grammar: use does instead of do where appropriateWed, 14 Oct 2015 02:06:54 -0400, by timeless
-
l10n: use %d instead of %s for numbersWed, 14 Oct 2015 22:29:03 -0400, by timeless
-
check-code: block non-portable pipe-andThu, 15 Oct 2015 20:36:12 -0400, by timeless
-
test-shelve: do not use non-portable pipe-andThu, 15 Oct 2015 20:32:01 -0400, by timeless
-
parsers: suppress warning of signed and unsigned comparison at nt_initSun, 18 Oct 2015 09:05:04 +0900, by Yuya Nishihara
-
parsers: correct type of temporary variables for dirstate tuple fieldsSat, 17 Oct 2015 23:14:13 +0900, by Yuya Nishihara
-
test: enforce v1 type in 'test-bundle2-remote-changegroup.t'Fri, 16 Oct 2015 02:53:57 +0100, by Pierre-Yves David
-
test: enforce v1 type in 'test-bundle2-format.t'Fri, 16 Oct 2015 02:51:34 +0100, by Pierre-Yves David
-
editmerge: properly quote variablesSat, 17 Oct 2015 15:48:14 -0700, by Ryan McElroy
-
commands.resolve: print out warning when only driver-resolved files remainThu, 15 Oct 2015 01:09:58 -0700, by Siddharth Agarwal
-
merge.mergestate: set merge driver state to 's' if there's none presentThu, 15 Oct 2015 01:06:29 -0700, by Siddharth Agarwal
-
merge.mergestate: only check for merge driver when property is accessedThu, 15 Oct 2015 01:04:46 -0700, by Siddharth Agarwal
-
localrepo.commit: abort if merge driver's conclude step hasn't been run yetThu, 15 Oct 2015 01:02:32 -0700, by Siddharth Agarwal
-
merge.mergestate: add a way to get the merge driver stateThu, 15 Oct 2015 00:57:56 -0700, by Siddharth Agarwal
-
merge.mergestate: add a way to get the other side of the mergeThu, 15 Oct 2015 00:49:07 -0700, by Siddharth Agarwal
-
commands.resolve: support printing out driver-resolved filesThu, 15 Oct 2015 00:45:20 -0700, by Siddharth Agarwal
-
histedit: make histedit prune when obsolete is enabledSat, 17 Oct 2015 12:32:23 -0700, by Durham Goode
-
clonebundles: rewrite documentationSat, 17 Oct 2015 11:23:54 -0700, by Gregory Szorc
-
exchange: support streaming clone bundles in clone bundlesSat, 17 Oct 2015 11:37:08 -0700, by Gregory Szorc
-
exchange: parse requirements from stream clone specification stringSat, 17 Oct 2015 10:26:34 -0700, by Gregory Szorc
-
exchange: support parameters in bundle specification stringsWed, 14 Oct 2015 17:00:34 -0700, by Gregory Szorc
-
commands: support consuming stream clone bundlesThu, 15 Oct 2015 13:43:18 -0700, by Gregory Szorc
-
commands: support creating stream clone bundlesSat, 17 Oct 2015 11:40:29 -0700, by Gregory Szorc
-
exchange: support for streaming clone bundlesThu, 15 Oct 2015 13:00:45 -0700, by Gregory Szorc
-
streamclone: support for producing and consuming stream clone bundlesSat, 17 Oct 2015 11:14:52 -0700, by Gregory Szorc
-
spelling: fix typo in transaction error messagesSat, 17 Oct 2015 15:28:02 -0500, by Matt Mackall
-
transaction: reorder unlinking .hg/journal and .hg/journal.backupfilesFri, 16 Oct 2015 03:29:51 +0900, by FUJIWARA Katsunori
-
merge: make in-memory changes visible to external update hooksSat, 17 Oct 2015 01:15:34 +0900, by FUJIWARA Katsunori
-
hook: centralize passing HG_PENDING to external hook processSat, 17 Oct 2015 01:15:34 +0900, by FUJIWARA Katsunori
-
cmdutil: make in-memory changes visible to external editor (issue4378)Sat, 17 Oct 2015 01:15:34 +0900, by FUJIWARA Katsunori
-
dirstate: show develwarn for write() invocation without transactionSat, 17 Oct 2015 01:15:34 +0900, by FUJIWARA Katsunori
-
dirstate: make dirstate.write() callers pass transaction object to itSat, 17 Oct 2015 01:15:34 +0900, by FUJIWARA Katsunori
-
dirstate: remove layering violation around writing dirstate outSat, 17 Oct 2015 01:15:34 +0900, by FUJIWARA Katsunori
-
dirstateguard: remove layering violation around saving/restoring backupSat, 17 Oct 2015 01:15:33 +0900, by FUJIWARA Katsunori
-
rebase: reduce scope of try catch in restorestateThu, 15 Oct 2015 15:20:44 -0700, by Christian Delahousse
-
rebase: on abort delete rebase state file no matter whatThu, 15 Oct 2015 12:13:46 -0700, by Christian Delahousse
-
contrib: make editmerge look for merge markers at the beginning of the lineFri, 16 Oct 2015 15:01:42 -0700, by Christian Delahousse
-
commit: abort when a committemplate is not changedFri, 09 Oct 2015 21:44:54 -0700, by Tony Tung
-
localrepo.commit: disallow commit when driver-resolved files existWed, 14 Oct 2015 16:04:43 -0700, by Siddharth Agarwal
-
merge.mergestate: add a generator for driver-resolved filesWed, 14 Oct 2015 15:01:07 -0700, by Siddharth Agarwal
-
hook: for python hooks, also return whether an exception was raisedWed, 14 Oct 2015 16:27:10 -0700, by Siddharth Agarwal
-
hook.runhooks: return a dict of result valuesWed, 14 Oct 2015 16:19:47 -0700, by Siddharth Agarwal
-
hook: factor out determination of hooks from running themWed, 14 Oct 2015 16:13:31 -0700, by Siddharth Agarwal
-
mq: generate patch names from first line of descriptionTue, 10 Mar 2015 13:19:17 +0100, by Mads Kiilerich
-
contrib: offer Python 2.7.10Thu, 15 Oct 2015 21:36:47 +0200, by Mads Kiilerich
-
contrib: drop Python < 2.6 from Makefile.pythonThu, 15 Oct 2015 21:35:49 +0200, by Mads Kiilerich
-
mergetools.rc: find OSX FileMerge in the new location inside Xcode 4.3Fri, 16 Oct 2015 11:37:34 +0200, by Mads Kiilerich
-
exchange: don't print error codes after clone bundle failureThu, 15 Oct 2015 14:53:32 -0700, by Gregory Szorc
-
debian: install bash completion as hg and not mercurial (issue4900)Wed, 14 Oct 2015 14:53:15 -0400, by Augie Fackler
-
merge-tools: allow marking a mergetool as completely disabledWed, 14 Oct 2015 12:57:33 -0400, by Augie Fackler
-
exchange: add oparg to push so that extensions can wrap pushopTue, 13 Oct 2015 23:04:53 -0700, by Sean Farley
-
destmerge: extract logic based on branch heads in its own functionThu, 15 Oct 2015 03:15:54 +0100, by Pierre-Yves David
-
destmerge: extract logic based on bookmark into its own functionThu, 15 Oct 2015 03:13:14 +0100, by Pierre-Yves David
-
destupdate: have a generic and extensible way to run each stepThu, 15 Oct 2015 03:00:09 +0100, by Pierre-Yves David
-
destupdate: extract logic based on branch in its own functionThu, 15 Oct 2015 02:33:09 +0100, by Pierre-Yves David
-
destupdate: extract logic based on bookmarks in its own functionThu, 15 Oct 2015 02:27:30 +0100, by Pierre-Yves David
-
destupdate: extract logic based on obsolescence marker in its own functionThu, 15 Oct 2015 02:15:43 +0100, by Pierre-Yves David
-
destupdate: move obsolete handling firstThu, 15 Oct 2015 02:12:55 +0100, by Pierre-Yves David
-
destupdate: indent bookmark and branch logicThu, 15 Oct 2015 02:12:15 +0100, by Pierre-Yves David
-
destupdate: extract validation logicThu, 15 Oct 2015 14:10:57 +0100, by Pierre-Yves David
-
rebase: rename and test '_destrebase'Thu, 15 Oct 2015 01:56:03 +0100, by Pierre-Yves David
-
rebase: directly use '_destrebase'Thu, 15 Oct 2015 01:51:53 +0100, by Pierre-Yves David
-
rebase: extra default destination in its own functionThu, 15 Oct 2015 01:50:31 +0100, by Pierre-Yves David
-
revset: rename and test '_destmerge'Thu, 15 Oct 2015 01:47:28 +0100, by Pierre-Yves David
-
merge: directly get destination from destutilThu, 15 Oct 2015 01:19:32 +0100, by Pierre-Yves David
-
destutil: move default merge destination into a functionThu, 15 Oct 2015 01:11:00 +0100, by Pierre-Yves David
-
revset: reintroduce and experimental revset for update destinationThu, 15 Oct 2015 01:35:44 +0100, by Pierre-Yves David
-
changegroup: move manifest unpacking into its own methodWed, 14 Oct 2015 15:11:53 -0400, by Augie Fackler
-
changegroup: move manifest packing into a separate functionThu, 01 Oct 2015 15:35:10 -0400, by Augie Fackler
-
changegroup: rename manifest linknode closure for clarityWed, 30 Sep 2015 19:59:12 -0400, by Augie Fackler
-
changegroup: reformat packermap and add commentTue, 29 Sep 2015 15:14:03 -0400, by Augie Fackler
-
changegroup: document the public surface area of cg?unpackersWed, 14 Oct 2015 12:05:27 -0400, by Augie Fackler
-
changegroup: mark cg1unpacker.chunklength as privateWed, 14 Oct 2015 11:58:56 -0400, by Augie Fackler
-
changegroup: note why a few methods on cg1unpacker existWed, 14 Oct 2015 11:58:35 -0400, by Augie Fackler
-
revlog: rename bundle to cg to reflect its nature as a cg?unpackerWed, 14 Oct 2015 11:32:33 -0400, by Augie Fackler
-
changegroup: mark _addchangegroupfiles as module-privateTue, 13 Oct 2015 17:16:10 -0400, by Augie Fackler
-
changegroup: delete now-unused addchangegroup methodTue, 13 Oct 2015 17:14:37 -0400, by Augie Fackler
-
localrepo: use cg?unpacker.apply() instead of changegroup.addchangegroup()Tue, 13 Oct 2015 17:14:07 -0400, by Augie Fackler
-
repair: use cg?unpacker.apply() instead of changegroup.addchangegroup()Tue, 13 Oct 2015 17:12:46 -0400, by Augie Fackler
-
exchange: use cg?unpacker.apply() instead of changegroup.addchangegroup()Tue, 13 Oct 2015 17:12:29 -0400, by Augie Fackler
-
commands: use cg?unpacker.apply() instead of changegroup.addchangegroup()Tue, 13 Oct 2015 17:12:12 -0400, by Augie Fackler
-
bundle2: use cg?unpacker.apply() instead of changegroup.addchangegroup()Tue, 13 Oct 2015 17:11:52 -0400, by Augie Fackler
-
shelve: use cg?unpacker.apply() instead of changegroup.addchangegroup()Tue, 13 Oct 2015 17:11:18 -0400, by Augie Fackler
-
histedit: use cg?unpacker.apply() instead of changegroup.addchangegroup()Tue, 13 Oct 2015 17:14:21 -0400, by Augie Fackler
-
changegroup: migrate addchangegroup() to forward to cg?unpacker.apply()Tue, 13 Oct 2015 16:58:51 -0400, by Augie Fackler
-
changegroup: move source check to top of addchangegroupTue, 13 Oct 2015 15:54:05 -0400, by Augie Fackler
-
error: remove superfluous pass statementsThu, 15 Oct 2015 09:52:32 -0400, by Augie Fackler
-
hook: raise a separate exception for when loading a hook failsMon, 12 Oct 2015 18:49:23 -0700, by Siddharth Agarwal
-
clonebundles: advertise clone bundles feature to clientsWed, 14 Oct 2015 11:05:53 -0700, by Gregory Szorc
-
exchange: advertise if a clone bundle was attemptedWed, 14 Oct 2015 10:36:20 -0700, by Gregory Szorc
-
exchange: record that we attempted to fetch a clone bundleTue, 13 Oct 2015 14:55:02 -0700, by Gregory Szorc
-
exchange: provide hint on how to disable clone bundlesTue, 13 Oct 2015 12:41:32 -0700, by Gregory Szorc
-
exchange: document filterclonebundleentriesWed, 14 Oct 2015 10:03:26 -0700, by Gregory Szorc
-
wireproto: properly parse false boolean args (BC)Wed, 14 Oct 2015 10:58:35 -0700, by Gregory Szorc
-
bundle2: gracefully skip 'obsmarkers' part if evolution is disabledThu, 15 Oct 2015 03:29:00 +0100, by Pierre-Yves David
-
obsstore: make the readonly attribute accessibleThu, 15 Oct 2015 12:45:34 +0100, by Pierre-Yves David
-
update: introduce a 'UpdateAbort' exceptionMon, 05 Oct 2015 04:26:26 -0700, by Pierre-Yves David
-
update: "deprecate" call to 'merge.update' without a destinationMon, 05 Oct 2015 21:42:09 -0700, by Pierre-Yves David
-
shelve: delete shelve statefile on any exception during abortWed, 14 Oct 2015 20:35:06 -0700, by Christian Delahousse
-
highlight: add option to prevent content-only based fallbackWed, 14 Oct 2015 18:22:16 -0700, by Gregory Szorc
-
highlight: inline checkfctx()Wed, 14 Oct 2015 17:43:44 -0700, by Gregory Szorc
-
highlight: consolidate duplicate codeWed, 14 Oct 2015 17:42:07 -0700, by Gregory Szorc
-
rebase: properly abort when destination is public (issue4896)Tue, 13 Oct 2015 14:06:51 -0700, by Christian Delahousse
-
bookmarks: don't deactivate on no-op update (issue4901)Wed, 14 Oct 2015 18:03:17 -0500, by Matt Mackall
-
rebase: properly handle chains of markers with missing nodesThu, 15 Oct 2015 00:32:20 +0100, by Pierre-Yves David
-
rebase: use a direct reference to repo.changelogWed, 14 Oct 2015 23:42:15 +0100, by Pierre-Yves David
-
mail: drop python 2.5 supportWed, 14 Oct 2015 22:21:05 -0400, by timeless
-
exchange: use pushop.repo instead of repoTue, 13 Oct 2015 22:53:08 -0700, by Sean Farley
-
rebase: factor out nothing to rebase return codeTue, 13 Oct 2015 03:20:05 -0700, by Ryan McElroy
-
gitweb: visually highlight source lines when hovering over line numbersThu, 15 Oct 2015 00:04:58 +0800, by Anton Shestakov
-
rebase: added commentsTue, 13 Oct 2015 14:17:15 -0700, by Christian Delahousse
-
monoblue: visually highlight source lines when hovering over line numbersWed, 14 Oct 2015 22:45:51 +0800, by Anton Shestakov
-
monoblue: make the size of line links bigger to cover line numbers betterWed, 14 Oct 2015 22:24:50 +0800, by Anton Shestakov
-
gitweb: don't drop current revision context on graph pageSat, 26 Sep 2015 18:16:49 +0800, by Anton Shestakov
-
util: also catch IndexErrorTue, 13 Oct 2015 16:05:30 -0700, by Sean Farley
-
exewrapper: add comments about PYTHONHOMEWed, 14 Oct 2015 12:23:49 +0200, by Adrian Buehlmann
-
exewrapper: report name of failed private DLL in error messageWed, 14 Oct 2015 12:23:04 +0200, by Adrian Buehlmann
-
exewrapper: report name of failed DLL in error messageWed, 14 Oct 2015 12:22:09 +0200, by Adrian Buehlmann
-
merge: abort on file/directory case folding collisions (issue4892)Tue, 13 Oct 2015 00:16:25 +0200, by Mads Kiilerich
-
tests: test of case-folding merge collisionsTue, 13 Oct 2015 00:16:25 +0200, by Mads Kiilerich
-
copies: group bothnew with other setsWed, 19 Aug 2015 15:40:13 -0500, by Matt Mackall
-
copies: rename renamedelete to renamedeleteset for clarityWed, 19 Aug 2015 15:32:27 -0500, by Matt Mackall
-
copies: move _makegetfctx calls into checkcopiesWed, 19 Aug 2015 15:26:08 -0500, by Matt Mackall
-
copies: factor out setupctx into _makegetfctxWed, 19 Aug 2015 15:17:33 -0500, by Matt Mackall
-
copies: avoid reference to c1/c2 in makectxFri, 21 Aug 2015 15:12:58 -0500, by Matt Mackall
-
mq: use cmdutil.revert instead of hg.revertMon, 12 Oct 2015 03:37:09 -0500, by Matt Mackall
-
debugmergestate: add support for printing out driver-resolved filesWed, 30 Sep 2015 21:48:53 -0700, by Siddharth Agarwal
-
debugmergestate: add support for printing out merge driverWed, 30 Sep 2015 21:47:27 -0700, by Siddharth Agarwal
-
merge.mergedriver: don't try resolving files marked driver-resolvedWed, 30 Sep 2015 19:43:51 -0700, by Siddharth Agarwal
-
merge.mergestate: add support for persisting driver-resolved filesMon, 28 Sep 2015 18:34:06 -0700, by Siddharth Agarwal
-
merge.mergestate: add support for persisting a custom merge driverWed, 30 Sep 2015 21:42:52 -0700, by Siddharth Agarwal
-
exchange: support sorting URLs by client-side preferencesTue, 13 Oct 2015 12:30:39 -0700, by Gregory Szorc
-
exchange: extract bundle specification components into own attributesTue, 13 Oct 2015 12:31:19 -0700, by Gregory Szorc
-
exchange: support preserving external names when parsing bundle specsTue, 13 Oct 2015 12:29:50 -0700, by Gregory Szorc
-
clonebundles: filter on SNI requirementTue, 13 Oct 2015 10:59:41 -0700, by Gregory Szorc
-
clonebundles: filter on bundle specificationTue, 13 Oct 2015 11:45:30 -0700, by Gregory Szorc
-
clonebundle: support bundle2Tue, 13 Oct 2015 10:41:54 -0700, by Gregory Szorc
-
update: also use 'destupdate' for pull and unbundleMon, 05 Oct 2015 21:31:32 -0700, by Pierre-Yves David
-
destupdate: also include bookmark related logicTue, 29 Sep 2015 01:03:26 -0700, by Pierre-Yves David
-
exchange: refactor bundle specification parsingTue, 13 Oct 2015 10:57:54 -0700, by Gregory Szorc
-
exchange: move bundle specification parsing from cmdutilTue, 13 Oct 2015 11:43:21 -0700, by Gregory Szorc
-
revset: add optional offset argument to limit() predicateTue, 24 Mar 2015 00:28:28 +0900, by Yuya Nishihara
-
revset: port limit() to support keyword argumentsMon, 12 Oct 2015 17:19:22 +0900, by Yuya Nishihara
-
revset: eliminate temporary reference to subset in limit() and last()Mon, 12 Oct 2015 17:14:47 +0900, by Yuya Nishihara
-
dirstate: read from pending file under HG_PENDING mode if it existsWed, 14 Oct 2015 02:49:17 +0900, by FUJIWARA Katsunori
-
dirstate: make writing in-memory changes aware of transaction activityWed, 14 Oct 2015 02:49:17 +0900, by FUJIWARA Katsunori
-
dirstate: make functions for backup aware of transaction activityWed, 14 Oct 2015 02:49:17 +0900, by FUJIWARA Katsunori
-
dirstate: move code paths for backup from dirstateguard to dirstateWed, 14 Oct 2015 02:49:17 +0900, by FUJIWARA Katsunori
-
localrepo: restore dirstate to one before rollbacking if not parent-goneTue, 13 Oct 2015 12:25:43 -0700, by FUJIWARA Katsunori
-
parsers: make pack_dirstate take now in integer for consistencyWed, 14 Oct 2015 02:40:04 +0900, by FUJIWARA Katsunori
-
destupdate: include the 'check' logicTue, 29 Sep 2015 00:18:49 -0700, by Pierre-Yves David
-
destupdate: move the check related to the "clean" logic in the functionMon, 05 Oct 2015 03:50:47 -0700, by Pierre-Yves David
-
largefiles: better handling of merge of largefiles that not are availableMon, 12 Oct 2015 19:22:34 +0200, by Mads Kiilerich
-
patchbomb: check that targets exist at the publicurlSun, 11 Oct 2015 22:13:03 -0700, by Pierre-Yves David
-
windows: read all global config files, not just the first (issue4491) (BC)Mon, 12 Oct 2015 20:13:12 +0200, by Mads Kiilerich
-
strip: factor out revset calculation for strip -BFri, 09 Oct 2015 14:48:59 -0700, by Ryan McElroy
-
clonebundles: support for seeding clones from pre-generated bundlesFri, 09 Oct 2015 11:22:01 -0700, by Gregory Szorc
-
sslutil: expose attribute indicating whether SNI is supportedTue, 29 Sep 2015 16:17:32 -0700, by Gregory Szorc
-
resolve: perform all premerges before performing any file merges (BC)Sun, 11 Oct 2015 23:58:07 -0700, by Siddharth Agarwal
-
test-resolve.t: add some tests for .orig file contentsSun, 11 Oct 2015 23:56:44 -0700, by Siddharth Agarwal
-
test-resolve.t: add some output to show order of operationsSun, 11 Oct 2015 23:54:40 -0700, by Siddharth Agarwal
-
merge.mergestate: perform all premerges before any merges (BC)Sun, 11 Oct 2015 21:56:39 -0700, by Siddharth Agarwal
-
merge: introduce a preresolve functionSun, 11 Oct 2015 20:12:12 -0700, by Siddharth Agarwal
-
merge.mergestate._resolve: also return completed statusSun, 11 Oct 2015 18:37:54 -0700, by Siddharth Agarwal
-
merge.mergestate: add a wrapper around resolveSun, 11 Oct 2015 18:29:50 -0700, by Siddharth Agarwal
-
simplemerge: move conflict warning message to filemergeFri, 09 Oct 2015 13:54:52 -0700, by Siddharth Agarwal
-
filemerge: clean up some dead codeSun, 11 Oct 2015 15:04:00 -0700, by Siddharth Agarwal
-
run-tests: add b-prefix on two strings to fix python3 supportMon, 12 Oct 2015 14:15:04 -0400, by Augie Fackler
-
filemerge: break overall filemerge into separate premerge and merge stepsSun, 11 Oct 2015 20:47:14 -0700, by Siddharth Agarwal
-
filemerge: only copy to backup during premerge stepSun, 11 Oct 2015 20:04:40 -0700, by Siddharth Agarwal
-
filemerge: only print out "merging f" output at premerge stepSun, 11 Oct 2015 20:02:53 -0700, by Siddharth Agarwal
-
filemerge: deindent the parts of filemerge outside the try blockThu, 08 Oct 2015 00:19:20 -0700, by Siddharth Agarwal
-
filemerge: introduce a premerge flag and functionSun, 11 Oct 2015 20:47:04 -0700, by Siddharth Agarwal
-
filemerge: also return whether the merge is completeSun, 11 Oct 2015 12:56:21 -0700, by Siddharth Agarwal
-
filemerge: add a wrapper around the filemerge functionSun, 11 Oct 2015 12:31:08 -0700, by Siddharth Agarwal
-
context: don't hex encode all unknown 20 char revision specs (issue4890)Fri, 09 Oct 2015 01:19:37 +0200, by Mads Kiilerich
-
discovery: put trivial branch firstMon, 12 Oct 2015 00:45:24 -0700, by Pierre-Yves David
-
shelve: rename 'publicancestors' to something accurate (issue4737)Fri, 09 Oct 2015 15:31:50 -0700, by Pierre-Yves David
-
makefile: add wheel build targetFri, 09 Oct 2015 12:30:46 -0500, by Nathan Goldbaum
-
setup: import setup from setuptools if FORCE_SETUPTOOLS is setFri, 09 Oct 2015 12:25:51 -0500, by Nathan Goldbaum
-
hgweb: remove obsolete -webkit-border-radius propertyMon, 12 Oct 2015 14:46:51 +0100, by Gijs Kruitbosch
-
monoblue: add a link to the latest file revisionMon, 12 Oct 2015 15:20:04 +0800, by Anton Shestakov
-
discovery: reference relevant bug in the faulty codeFri, 09 Oct 2015 15:44:00 -0700, by Pierre-Yves David
-
discovery: fix a typo in a commentFri, 09 Oct 2015 15:37:05 -0700, by Pierre-Yves David
-
getsubset: get the unpacker version from the bundlerFri, 09 Oct 2015 14:59:37 -0700, by Pierre-Yves David
-
test-convert-cvs: add sleep so cvs notices changesMon, 12 Oct 2015 15:42:32 +0300, by Emanuele Giaquinta
-
cvsps: fix computation of parent revisions when log caching is onWed, 07 Oct 2015 11:33:52 +0300, by Emanuele Giaquinta
-
dirstate: batch calls to statfiles (issue4878)Tue, 06 Oct 2015 16:26:20 -0500, by Matt Mackall
-
parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888)Sun, 11 Oct 2015 18:30:47 +0900, by Yuya Nishihara
-
parsers: read sizes of metadata pair of obsolete marker at onceSun, 11 Oct 2015 18:41:41 +0900, by Yuya Nishihara
-
filemerge: clean up temp files in a finally blockWed, 07 Oct 2015 21:51:24 -0700, by Siddharth Agarwal
-
check-code: detect and ban 'util.Abort'Thu, 08 Oct 2015 12:53:09 -0700, by Pierre-Yves David
-
error: get Abort from 'error' instead of 'util'Thu, 08 Oct 2015 12:55:45 -0700, by Pierre-Yves David
-
eol: rename 'error' to 'haserror'Mon, 05 Oct 2015 22:49:24 -0700, by Pierre-Yves David
-
discovery: rename 'error' to 'errormsg'Mon, 05 Oct 2015 22:29:57 -0700, by Pierre-Yves David
-
histedit: delete histedit statefile on any exception during abortMon, 05 Oct 2015 16:44:45 -0700, by Christian Delahousse
-
histedit: check presence of statefile before deleting itTue, 06 Oct 2015 15:09:28 -0700, by Christian Delahousse
-
histedit: add inprogress method to state classMon, 05 Oct 2015 16:34:17 -0700, by Christian Delahousse
-
commands: use dirstateguard instead of begin/end-parentchange for backoutFri, 09 Oct 2015 03:53:47 +0900, by FUJIWARA Katsunori
-
commands: make "hg import" use dirstateguard only for --no-commitFri, 09 Oct 2015 03:53:47 +0900, by FUJIWARA Katsunori
-
cmdutil: stop tryimportone from using dirstateguard (BC)Fri, 09 Oct 2015 03:53:46 +0900, by FUJIWARA Katsunori
-
dirstate: remove meaningless dirstateguardFri, 09 Oct 2015 03:53:46 +0900, by FUJIWARA Katsunori
-
localrepo: execute appropriate actions for dirstate at releasing transactionFri, 09 Oct 2015 03:53:46 +0900, by FUJIWARA Katsunori
-
transaction: add releasefn to notify the end of a transaction scopeFri, 09 Oct 2015 03:53:46 +0900, by FUJIWARA Katsunori
-
filemerge: move post-merge checks into a separate functionWed, 07 Oct 2015 23:35:30 -0700, by Siddharth Agarwal
-
filemerge._xmerge: drop no longer necessary 'if r:' checkThu, 08 Oct 2015 14:18:43 -0700, by Siddharth Agarwal
-
filemerge._idump: drop no longer necessary 'if r:' checkThu, 08 Oct 2015 14:17:31 -0700, by Siddharth Agarwal
-
filemerge._merge: drop no longer necessary 'if r:' checkThu, 08 Oct 2015 14:16:19 -0700, by Siddharth Agarwal
-
revset: delete _updatedefaultdest as it has no usersMon, 05 Oct 2015 02:33:45 -0700, by Pierre-Yves David
-
merge: get the default update destination from the functionMon, 28 Sep 2015 22:11:23 -0700, by Pierre-Yves David
-
update: move default destination computation to a functionMon, 05 Oct 2015 01:46:47 -0700, by Pierre-Yves David
-
worker: restore old countcpus code (issue4869)Thu, 08 Oct 2015 10:57:03 -0700, by Gregory Szorc
-
filemerge: call premerge directly from main merge functionWed, 07 Oct 2015 21:22:16 -0700, by Siddharth Agarwal
-
bundle2: allow lazily acquiring the lockMon, 05 Oct 2015 16:19:54 -0700, by Durham Goode
-
bundle2: add op.gettransaction() to handlers that need the lockTue, 06 Oct 2015 14:42:29 -0700, by Durham Goode
-
merge with stableThu, 08 Oct 2015 17:44:22 -0500, by Matt Mackall
-
patchbomb: add a 'bundletype' config under 'patchbomb'Thu, 01 Oct 2015 23:13:57 -0700, by Pierre-Yves David
-
import: allow processing of extra part header after importWed, 07 Oct 2015 13:05:25 -0700, by Pierre-Yves David
-
import: allow processing of extra part header during importTue, 06 Oct 2015 09:51:24 -0700, by Pierre-Yves David
-
extract: parse 'nodeid' using the generic mechanismTue, 06 Oct 2015 02:23:21 -0700, by Pierre-Yves David
-
extract: parse 'branch' using the generic mechanismTue, 06 Oct 2015 02:22:23 -0700, by Pierre-Yves David
-
extract: parse 'date' using the generic mechanismWed, 07 Oct 2015 01:13:36 -0700, by Pierre-Yves David
-
extract: add some facility for extensible header parsingWed, 07 Oct 2015 01:20:49 -0700, by Pierre-Yves David
-
extract: remove the 'user' variableTue, 06 Oct 2015 02:16:24 -0700, by Pierre-Yves David
-
extract: use a single returnTue, 06 Oct 2015 02:11:09 -0700, by Pierre-Yves David
-
extract: move 'nodeid' assignment where it is parsedWed, 07 Oct 2015 00:50:53 -0700, by Pierre-Yves David
-
extract: move 'date' assignment where it is parsedTue, 06 Oct 2015 02:08:32 -0700, by Pierre-Yves David
-
extract: assign user to 'data' earlierTue, 06 Oct 2015 02:07:33 -0700, by Pierre-Yves David
-
extract: move 'branch' assignment where it is parsedTue, 06 Oct 2015 02:06:36 -0700, by Pierre-Yves David
-
extract: directly assign parent to data dictionaryTue, 06 Oct 2015 02:05:56 -0700, by Pierre-Yves David
-
extract: assign message only onceTue, 06 Oct 2015 02:04:46 -0700, by Pierre-Yves David
-
extract: simplify parents assignementTue, 06 Oct 2015 02:04:06 -0700, by Pierre-Yves David
-
patch: move 'extract' return to a dictionnaryTue, 06 Oct 2015 02:01:53 -0700, by Pierre-Yves David
-
patchbomb: add experimental config of a "pullurl" and export itTue, 06 Oct 2015 01:49:04 -0700, by Pierre-Yves David
-
export: introduce a generic way to add patch header on exportMon, 05 Oct 2015 23:17:01 -0700, by Pierre-Yves David
-
incoming: request a bundle2 when possible (BC)Mon, 05 Oct 2015 00:23:20 -0700, by Pierre-Yves David
-
bundlerepo: indent some code to prepare next patchMon, 05 Oct 2015 00:18:11 -0700, by Pierre-Yves David
-
bundle2: add a way to just forward the bundle2 stream to another userThu, 08 Oct 2015 01:40:21 -0700, by Pierre-Yves David
-
bundle2: split parameter retrieval and processingMon, 05 Oct 2015 01:10:49 -0700, by Pierre-Yves David
-
changegroup: extract the file management part in its own functionMon, 05 Oct 2015 00:14:47 -0700, by Pierre-Yves David
-
unbundle: properly read head modification result from bundle2Sun, 04 Oct 2015 21:48:19 -0700, by Pierre-Yves David
-
revset: strip off "literal:" prefix from bookmark not found errorWed, 07 Oct 2015 23:04:31 +0900, by Yuya Nishihara
-
revset: do not fall through to revspec for literal: branch (issue4838)Wed, 07 Oct 2015 23:00:29 +0900, by Yuya Nishihara
-
hgweb: ensure both foreground and background colors are specified (issue4872)Wed, 07 Oct 2015 21:08:14 +0100, by Gijs Kruitbosch
-
templater: do not pre-evaluate generator keyword at runsymbol (issue4868) stableThu, 08 Oct 2015 23:24:38 +0900, by Yuya Nishihara
-
merge: drop special parent assignment in the obsolete caseMon, 05 Oct 2015 01:47:33 -0700, by Pierre-Yves David
-
bundle: use bundle2 if repository uses general deltaThu, 01 Oct 2015 20:31:43 -0700, by Pierre-Yves David
-
parsebundletype: add a comment for future generationThu, 01 Oct 2015 20:21:16 -0700, by Pierre-Yves David
-
bundle: extend the format of --type to support version and compressionThu, 01 Oct 2015 19:16:00 -0700, by Pierre-Yves David
-
hgweb: fix border-radius for standards-based browsersWed, 07 Oct 2015 20:19:20 +0100, by Gijs Kruitbosch
-
filemerge: move precheck to before files are written outWed, 07 Oct 2015 21:28:43 -0700, by Siddharth Agarwal
-
filemerge: move 'merging' output to before file creationWed, 07 Oct 2015 22:58:52 -0700, by Siddharth Agarwal
-
filemerge.filemerge: make a tuple containing merge paths on diskWed, 07 Oct 2015 21:21:56 -0700, by Siddharth Agarwal
-
filemerge: switch trymerge boolean to mergetype enumWed, 07 Oct 2015 16:14:57 -0700, by Siddharth Agarwal
-
filemerge: add some merge typesWed, 07 Oct 2015 15:13:41 -0700, by Siddharth Agarwal
-
shelve: restore unshelved dirstate explicitly after aborting transactionThu, 08 Oct 2015 01:41:30 +0900, by FUJIWARA Katsunori
-
shelve: restore shelved dirstate explicitly after aborting transactionThu, 08 Oct 2015 01:41:30 +0900, by FUJIWARA Katsunori
-
shelve: add utility to abort current transaction but keep dirstateThu, 08 Oct 2015 01:41:30 +0900, by FUJIWARA Katsunori
-
dirstate: split write to write changes into files other than .hg/dirstateThu, 08 Oct 2015 01:41:30 +0900, by FUJIWARA Katsunori
-
bookmarks: use recordchange instead of writing if transaction is activeThu, 08 Oct 2015 01:41:30 +0900, by FUJIWARA Katsunori
-
filemerge: run symlink check for :merge3Wed, 07 Oct 2015 00:27:23 -0700, by Siddharth Agarwal
-
filemerge: print correct name of tool for symlink checksWed, 07 Oct 2015 00:24:44 -0700, by Siddharth Agarwal
-
filemerge: normalize 'internal:foo' names to ':foo'Wed, 07 Oct 2015 00:01:16 -0700, by Siddharth Agarwal
-
filemerge: use symlinkcheck for :merge and :unionTue, 06 Oct 2015 22:57:21 -0700, by Siddharth Agarwal
-
filemerge: add a precheck for symlinksTue, 06 Oct 2015 22:56:33 -0700, by Siddharth Agarwal
-
filemerge: call precheck if availableTue, 06 Oct 2015 22:55:21 -0700, by Siddharth Agarwal
-
filemerge: add a before-merge callback to internal merge toolsTue, 06 Oct 2015 22:54:14 -0700, by Siddharth Agarwal
-
filemerge: indent filemerge.filemergeTue, 06 Oct 2015 17:39:13 -0700, by Siddharth Agarwal
-
test-bundle-type: replace unbundle with debugbundleThu, 01 Oct 2015 20:15:00 -0700, by Pierre-Yves David
-
bundle: extract the parsing of the bundle type in a functionThu, 01 Oct 2015 18:01:24 -0700, by Pierre-Yves David
-
changegroup: add version argument to getchangegroupThu, 01 Oct 2015 19:14:47 -0700, by Pierre-Yves David
-
changegroup: add version argument to getlocalchangegroupThu, 01 Oct 2015 19:14:33 -0700, by Pierre-Yves David
-
shelve: bundle using bundle2 if repository is general delta (issue4862)Thu, 01 Oct 2015 15:08:00 -0700, by Pierre-Yves David
-
shelve: move changegroup generation inside writebundleThu, 01 Oct 2015 15:09:32 -0700, by Pierre-Yves David
-
shelve: compress on-disk bundleTue, 29 Sep 2015 17:14:30 -0700, by Pierre-Yves David
-
merge with stableWed, 07 Oct 2015 13:44:48 -0500, by Matt Mackall
-
notify: fix fromauthor setting for 'incoming' hook type (issue4194) stableMon, 05 Oct 2015 10:43:16 -0600, by Bruce Cran
-
templater: protect word() from crashing on out of range negative value stableMon, 05 Oct 2015 12:37:26 -0400, by Matt Harbison
-
commands: add a new debug command to print merge stateFri, 02 Oct 2015 13:00:47 -0700, by Siddharth Agarwal
-
merge.mergestate: factor out code to validate v1/v2 recordsWed, 30 Sep 2015 21:22:31 -0700, by Siddharth Agarwal
-
localrepo: prevent wlock from being inherited when a transaction is runningTue, 06 Oct 2015 13:19:05 -0700, by Siddharth Agarwal
-
lock: add a way to prevent locks from being inheritedTue, 06 Oct 2015 13:13:31 -0700, by Siddharth Agarwal
-
test-fncache: use args/kwargs for lock wrapperTue, 06 Oct 2015 15:55:50 -0700, by Siddharth Agarwal
-
rebase: enable histedit for useful help with itTue, 06 Oct 2015 15:07:00 -0400, by timeless
-
rebase: suggest help -e histeditTue, 06 Oct 2015 15:01:25 -0400, by timeless
-
rebase: factor out histedit help commandTue, 06 Oct 2015 15:05:40 -0400, by timeless
-
util: use tuple accessor to get accurate st_mtime value (issue4836)Sun, 04 Oct 2015 22:35:36 +0900, by Yuya Nishihara
-
util: extract stub function to get mtime with second accuracySun, 04 Oct 2015 22:25:29 +0900, by Yuya Nishihara
-
scmutil: add a way for a repo's wlock to be inherited by a subprocessMon, 05 Oct 2015 14:37:59 -0700, by Siddharth Agarwal
-
scmutil: add a way for a subprocess to be run with an inheritable lockMon, 05 Oct 2015 14:34:52 -0700, by Siddharth Agarwal
-
localrepo: add a way to get the current wlock if it's heldMon, 05 Oct 2015 14:27:37 -0700, by Siddharth Agarwal
-
localrepo: add a way to get the current lock if it's heldMon, 05 Oct 2015 14:26:53 -0700, by Siddharth Agarwal
-
test-help: verify that extension keywords appear in help templatesThu, 24 Sep 2015 13:58:18 -0400, by timeless
-
templatekw: add {changes}, {distance} and {tag} to the {latesttag} keywordMon, 24 Aug 2015 23:30:17 -0400, by Matt Harbison
-
templater: introduce {latesttag()} function to match a pattern (issue4184)Sun, 23 Aug 2015 23:44:58 -0400, by Matt Harbison
-
templatekw: introduce showlatesttags() to handle {latesttag} keywordsMon, 24 Aug 2015 23:07:00 -0400, by Matt Harbison
-
templatekw: factor out the changessincetag calculation to a private methodMon, 05 Oct 2015 21:11:50 -0400, by Matt Harbison
-
templatekw: allow getlatesttags() to match a specific tag patternSun, 23 Aug 2015 23:22:55 -0400, by Matt Harbison
-
util: extract stringmatcher() from revsetSat, 22 Aug 2015 22:52:18 -0400, by Matt Harbison
-
util.chunkbuffer: avoid extra mutations when reading partial chunksMon, 05 Oct 2015 17:36:32 -0700, by Gregory Szorc
-
util.chunkbuffer: refactor chunk handling logicMon, 05 Oct 2015 16:34:47 -0700, by Gregory Szorc
-
util.chunkbuffer: special case reading everythingMon, 05 Oct 2015 16:28:12 -0700, by Gregory Szorc
-
revert: add reference to backoutMon, 05 Oct 2015 07:13:35 +0200, by Mathias De Maré
-
backout: add reference to revertMon, 05 Oct 2015 07:11:48 +0200, by Mathias De Maré
-
localrepo: allow wlock to be inheritedFri, 25 Sep 2015 12:39:23 -0700, by Siddharth Agarwal
-
lock.release: don't call postrelease functions for inherited locksSun, 04 Oct 2015 20:04:44 -0700, by Siddharth Agarwal
-
lock: turn prepinherit/reacquire into a single context managerSun, 04 Oct 2015 20:02:50 -0700, by Siddharth Agarwal
-
localrepo: add a note about parentenvvarSun, 04 Oct 2015 19:28:43 -0700, by Siddharth Agarwal
-
exchange: add "streaming all changes" to bundle2 pullingSun, 04 Oct 2015 12:11:44 -0700, by Gregory Szorc
-
streamclone: move "streaming all changes" message locationSun, 04 Oct 2015 12:07:01 -0700, by Gregory Szorc
-
streamclone: move payload header generation into own functionSun, 04 Oct 2015 19:06:06 -0700, by Gregory Szorc
-
streamclone: move payload header line consumptionSun, 04 Oct 2015 18:44:46 -0700, by Gregory Szorc
-
streamclone: teach canperformstreamclone to be bundle2 awareSun, 04 Oct 2015 18:35:19 -0700, by Gregory Szorc
-
streamclone: refactor canperformstreamclone to accept a pullopSun, 04 Oct 2015 11:50:42 -0700, by Gregory Szorc
-
exchange: expose bundle2 availability on pulloperationSun, 04 Oct 2015 12:03:30 -0700, by Gregory Szorc
-
exchange: expose bundle2 capabilities on pulloperationSun, 04 Oct 2015 18:31:53 -0700, by Gregory Szorc
-
keyword: make restrict mode False while updating files for rollbackSun, 04 Oct 2015 21:33:29 +0900, by FUJIWARA Katsunori
-
streamclone: rename and document maybeperformstreamclone()Sun, 04 Oct 2015 11:34:28 -0700, by Gregory Szorc
-
streamclone: move applyremotedata() into maybeperformstreamclone()Sun, 04 Oct 2015 11:27:10 -0700, by Gregory Szorc
-
branchmap: move branch cache code out of streamclone.pySat, 03 Oct 2015 09:53:56 -0700, by Gregory Szorc
-
streamclone: move streamin() into maybeperformstreamclone()Fri, 02 Oct 2015 23:08:15 -0700, by Gregory Szorc
-
streamclone: refactor maybeperformstreamclone to take a pullopSun, 04 Oct 2015 11:20:52 -0700, by Gregory Szorc
-
demandimport: replace more references to _demandmod instancesSun, 04 Oct 2015 11:17:43 -0700, by Gregory Szorc
-
demandimport: refactor processfromitemSun, 04 Oct 2015 10:36:54 -0700, by Gregory Szorc
-
demandimport: consolidate code for processing items in fromlistSat, 03 Oct 2015 15:30:17 -0700, by Gregory Szorc
-
pager: recreate stdout to make it line-bufferedSat, 03 Oct 2015 15:16:33 +0900, by Yuya Nishihara
-
pager: rename variables of backup fdsSat, 03 Oct 2015 18:48:21 +0900, by Yuya Nishihara
-
pager: inline _pagersubprocess() into _runpager()Sat, 03 Oct 2015 15:02:52 +0900, by Yuya Nishihara
-
ui: send traceback of devel warning to appropriate output streamSat, 03 Oct 2015 23:10:40 +0900, by Yuya Nishihara
-
util.system: compare fileno to see if it needs stdout redirectionSat, 03 Oct 2015 14:57:24 +0900, by Yuya Nishihara
-
exchange: move stream clone logic into pull code pathFri, 02 Oct 2015 23:04:52 -0700, by Gregory Szorc
-
exchange: teach pull about requested stream clonesFri, 02 Oct 2015 22:16:34 -0700, by Gregory Szorc
-
streamclone: add explicit check for empty local repoFri, 02 Oct 2015 21:53:25 -0700, by Gregory Szorc
-
streamclone: refactor code for deciding to stream cloneFri, 02 Oct 2015 22:22:11 -0700, by Gregory Szorc
-
streamclone: move streaming clone logic from localrepoFri, 02 Oct 2015 21:39:04 -0700, by Gregory Szorc
-
streamclone: move _allowstream() from wireprotoFri, 02 Oct 2015 16:24:56 -0700, by Gregory Szorc
-
streamclone: move code out of exchange.pyFri, 02 Oct 2015 16:05:52 -0700, by Gregory Szorc
-
streamclone: move stream_in() from localrepoFri, 02 Oct 2015 15:58:24 -0700, by Gregory Szorc
-
streamclone: move applystreamclone() from localrepo.pyFri, 02 Oct 2015 15:51:32 -0700, by Gregory Szorc
-
exchange: add docstring to pull()Fri, 02 Oct 2015 15:36:00 -0700, by Gregory Szorc
-
localrepo: allow creating inherited locksFri, 25 Sep 2015 12:28:12 -0700, by Siddharth Agarwal
-
error: make lock inheritance contract violations a subclass of RuntimeErrorFri, 25 Sep 2015 12:56:05 -0700, by Siddharth Agarwal
-
templatekw: hide help of "branches" by DEPRECATED markerSat, 26 Sep 2015 12:19:39 +0900, by Yuya Nishihara
-
templatekw: remove dockeywords hackSat, 26 Sep 2015 12:39:13 +0900, by Yuya Nishihara
-
templatekw: port implementation of showparents() from changeset_templaterSat, 26 Sep 2015 12:38:02 +0900, by Yuya Nishihara
-
templatekw: reorder stub of showparents() functionSat, 26 Sep 2015 12:32:03 +0900, by Yuya Nishihara
-
changeset_printer: move _meaningful_parentrevs() to scmutilSat, 26 Sep 2015 12:29:09 +0900, by Yuya Nishihara
-
test-run-tests: add globs for WindowsThu, 01 Oct 2015 22:14:11 -0400, by Matt Harbison
-
test-commandserver: generate files with a fixed EOL for test stabilityThu, 01 Oct 2015 21:49:50 -0400, by Matt Harbison
-
test-debugextensions: sanitize JSON output for WindowsThu, 01 Oct 2015 21:24:10 -0400, by Matt Harbison
-
test-strip: add glob for WindowsThu, 01 Oct 2015 21:10:38 -0400, by Matt Harbison
-
bundle2: generate check:heads in a independent functionThu, 01 Oct 2015 10:48:14 -0700, by Ryan McElroy
-
merge with stableThu, 01 Oct 2015 12:17:46 -0500, by Matt Mackall
-
cmdutil: handle multiline translations of HG: messages safelyWed, 30 Sep 2015 12:36:30 -0400, by timeless
-
strip: compress bundle2 backup using BZTue, 29 Sep 2015 14:42:03 -0700, by Pierre-Yves David
-
writebundle: add a compression argument for the bundle2 caseTue, 29 Sep 2015 14:41:40 -0700, by Pierre-Yves David
-
strip: use bundle2 + cg2 by default when repository use general deltaTue, 29 Sep 2015 13:16:51 -0700, by Pierre-Yves David
-
run-tests: report paths saved by --keep-tmpdirWed, 30 Sep 2015 16:01:19 -0400, by timeless
-
urls: bulk-change primary website URLsWed, 30 Sep 2015 15:43:49 -0500, by Matt Mackall
-
urls: bulk-change BTS urls to new locationWed, 30 Sep 2015 15:31:07 -0500, by Matt Mackall
-
largefiles: restore archiving largefiles with hgweb (issue4859) stable 3.5.2Tue, 29 Sep 2015 23:29:44 -0400, by Matt Harbison
-
help: hide deprecated filesets, revsets and template items if not verboseSat, 26 Sep 2015 12:17:44 +0900, by Yuya Nishihara
-
help: pass around ui to rewriter hooks (API)Sat, 26 Sep 2015 12:11:46 +0900, by Yuya Nishihara
-
help: pass around ui to doc loader (API)Sat, 26 Sep 2015 12:06:30 +0900, by Yuya Nishihara
-
gendoc: use real ui in place of stdoutSun, 27 Sep 2015 23:34:37 +0900, by Yuya Nishihara
-
check-seclevel: use ui to show status and error messagesSun, 27 Sep 2015 22:29:07 +0900, by Yuya Nishihara
-
unbundle: test and fix for clean abort on unknown bundle2 featureThu, 24 Sep 2015 17:52:21 -0700, by Pierre-Yves David
-
merge with stableTue, 29 Sep 2015 14:33:31 -0500, by Matt Mackall
-
localrepo: recreate phasecache if changelog was modified (issue4855)Tue, 29 Sep 2015 21:57:08 +0900, by Yuya Nishihara
-
progress: force a repaint of a printed progress bar after a clear()Sat, 26 Sep 2015 00:10:48 -0400, by Augie Fackler
-
tests: fix test-bundle2-format outputTue, 29 Sep 2015 14:08:37 -0500, by Matt Mackall
-
localrepo: recreate phasecache if changelog was modified (issue4855) stableTue, 29 Sep 2015 21:57:08 +0900, by Yuya Nishihara
-
bundle2: allow compressed bundleWed, 23 Sep 2015 12:56:12 -0700, by Pierre-Yves David
-
test-bundle2: dump bundle content using f --hexdumpMon, 28 Sep 2015 15:01:20 -0700, by Pierre-Yves David
-
treemanifest: rework lazy-copying code (issue4840)Fri, 25 Sep 2015 22:54:46 -0400, by Augie Fackler
-
manifest: rename treemanifest load functions to ease debuggingFri, 25 Sep 2015 17:18:28 -0400, by Augie Fackler
-
manifest: add id(self) to treemanifest __repr__Fri, 25 Sep 2015 17:17:36 -0400, by Augie Fackler
-
bundlerepo: let bundle repo look in the _mancacheMon, 28 Sep 2015 10:27:36 -0700, by Durham Goode
-
check-seclevel: wrap entry point by functionSun, 27 Sep 2015 22:19:54 +0900, by Yuya Nishihara
-
check-seclevel: set executable bit as it has shebangSun, 27 Sep 2015 22:16:24 +0900, by Yuya Nishihara
-
bundle20: extract core payload generation in its own functionWed, 23 Sep 2015 12:56:05 -0700, by Pierre-Yves David
-
unbundle20: allow registering handlers for stream level parametersWed, 23 Sep 2015 14:00:16 -0700, by Pierre-Yves David
-
bundle2: allow to specify unsupported value on errorWed, 23 Sep 2015 11:55:27 -0700, by Pierre-Yves David
-
bundle2: rename error exception class for unsupported featureWed, 23 Sep 2015 11:44:52 -0700, by Pierre-Yves David
-
changegroup: use a different compression key for BZ in HG10Wed, 23 Sep 2015 11:33:30 -0700, by Pierre-Yves David
-
monoblue: provide links to branches, tags and bookmarks by nameSat, 26 Sep 2015 17:24:12 +0800, by Anton Shestakov
-
gitweb: provide links to branches, tags and bookmarks by nameSat, 26 Sep 2015 17:15:58 +0800, by Anton Shestakov
-
cmdutil: remove HG: prefix from translation stringsFri, 25 Sep 2015 03:44:15 -0400, by timeless
-
i18n-zh_CN: annotate broken HG: translationsFri, 25 Sep 2015 03:47:48 -0400, by timeless
-
lock: recognize parent locks while acquiringThu, 24 Sep 2015 22:07:55 -0700, by Siddharth Agarwal
-
test-lock.py: fix testing for forksThu, 24 Sep 2015 22:00:51 -0700, by Siddharth Agarwal
-
test-lock.py: allow PID to be changed in test stateThu, 24 Sep 2015 20:40:00 -0700, by Siddharth Agarwal
-
test-lock.py: add a lock wrapper that allows faking the PIDThu, 24 Sep 2015 20:22:59 -0700, by Siddharth Agarwal
-
lock: add a wrapper to os.getpid() to make testing easierThu, 24 Sep 2015 21:26:37 -0700, by Siddharth Agarwal
-
test-lock.py: move temp dir generation to testcaseThu, 24 Sep 2015 19:52:34 -0700, by Siddharth Agarwal
-
test-lock.py: copy-edit assertions about file existingThu, 24 Sep 2015 17:33:13 -0700, by Siddharth Agarwal
-
revlog: don't flush data file after every added revisionSat, 26 Sep 2015 21:43:13 -0700, by Gregory Szorc
-
revlog: use existing file handle when reading during _addrevisionSun, 27 Sep 2015 16:08:18 -0700, by Gregory Szorc
-
revlog: always open revlogs for reading and appendingSun, 27 Sep 2015 15:59:19 -0700, by Gregory Szorc
-
revlog: support using an existing file handle when reading revlogsSun, 27 Sep 2015 15:48:35 -0700, by Gregory Szorc
-
revlog: add docstring for checkinlinesize()Sun, 27 Sep 2015 15:31:50 -0700, by Gregory Szorc
-
windows: insert file positioning call between reads and writesSun, 27 Sep 2015 18:46:53 -0700, by Gregory Szorc
-
tests: suppress verbose output of svn transactionSat, 26 Sep 2015 15:20:32 +0900, by Yuya Nishihara
-
formatter: use dict.update() to set arguments passed to write functionsWed, 23 Sep 2015 21:54:47 +0900, by Yuya Nishihara
-
formatter: verify number of arguments passed to write functionsWed, 23 Sep 2015 21:51:48 +0900, by Yuya Nishihara
-
help: unify handling of DEPRECATED/EXPERIMENTAL keywordsSat, 26 Sep 2015 11:50:47 +0900, by Yuya Nishihara
-
help: include parens in DEPRECATED/EXPERIMENTAL keywordsSat, 26 Sep 2015 11:38:39 +0900, by Yuya Nishihara
-
help: define list of keywords that should be excluded from non-verbose outputSat, 26 Sep 2015 11:25:38 +0900, by Yuya Nishihara
-
merge with stableFri, 25 Sep 2015 23:10:47 -0500, by Matt Mackall
-
unbundle: cleanly abort on unknown bundle2 feature stableFri, 25 Sep 2015 13:30:49 -0700, by Pierre-Yves David
-
phases: return zero for no-op operations (issue4751) (BC)Mon, 14 Sep 2015 19:25:34 -0400, by Jordi Gutiérrez Hermoso
-
help: add config.troubleshooting section at the topThu, 24 Sep 2015 14:45:17 -0400, by timeless
-
dispatch: don't stack trace on commands like `hg .log`Fri, 25 Sep 2015 11:16:20 -0400, by Jordi Gutiérrez Hermoso
-
gitweb, monoblue: port highlighting linked lines from paperFri, 25 Sep 2015 12:38:20 +0800, by Anton Shestakov
-
gitweb, monoblue: fix vertical align of spans in .sourcelinesFri, 25 Sep 2015 03:02:38 +0800, by Anton Shestakov
-
merge: fix mergestate commentFri, 25 Sep 2015 00:54:20 -0400, by timeless
-
rebase: avoid losing branch commits with --keepbranch (issue4835)Thu, 24 Sep 2015 17:51:05 -0400, by timeless
-
lock.release: do not unlink inherited locksThu, 24 Sep 2015 16:03:26 -0700, by Siddharth Agarwal
-
lock: add a method to reacquire the lock after subprocesses exitThu, 24 Sep 2015 16:00:41 -0700, by Siddharth Agarwal
-
lock: add a method to prepare the lock for inheritanceThu, 24 Sep 2015 10:37:13 -0700, by Siddharth Agarwal
-
lock: introduce state to keep track of inheritanceThu, 24 Sep 2015 15:57:11 -0700, by Siddharth Agarwal
-
error: add an exception to indicate lock inheritance API contract violationsThu, 24 Sep 2015 10:53:16 -0700, by Siddharth Agarwal
-
clone: check update rev for being TrueThu, 24 Sep 2015 15:52:11 -0700, by Sean Farley
-
clone: fix over-indented continuation lineThu, 24 Sep 2015 15:47:23 -0700, by Sean Farley
-
resolve: consistently describe re-merge + unresolvedFri, 25 Sep 2015 03:51:46 -0400, by timeless
-
mercurial: add debugextensions command (issue4676)Thu, 10 Sep 2015 16:53:07 +0200, by liscju
-
dispatch: stop warning about EPIPE in --debug modeThu, 24 Sep 2015 10:15:37 +0300, by Daniel Colascione
-
rebase: don't rebase obsolete commit whose successor is already rebasedMon, 14 Sep 2015 17:31:48 -0700, by Laurent Charignon
-
check-code: forbid mutable value for default argumentThu, 24 Sep 2015 00:34:15 -0700, by Pierre-Yves David
-
httpconnection: remove a mutable default argumentThu, 24 Sep 2015 00:54:30 -0700, by Pierre-Yves David
-
transplant: remove a mutable default argumentThu, 24 Sep 2015 00:52:21 -0700, by Pierre-Yves David
-
mq: remove a mutable default argumentThu, 24 Sep 2015 00:50:06 -0700, by Pierre-Yves David
-
largefiles: remove a mutable default argumentThu, 24 Sep 2015 00:49:02 -0700, by Pierre-Yves David
-
largefiles: remove a mutable default argumentThu, 24 Sep 2015 00:48:24 -0700, by Pierre-Yves David
-
largefiles: remove a mutable default argumentThu, 24 Sep 2015 00:48:02 -0700, by Pierre-Yves David
-
largefiles: remove a mutable default argumentThu, 24 Sep 2015 00:46:37 -0700, by Pierre-Yves David
-
largefiles: remove a mutable default argumentThu, 24 Sep 2015 00:46:12 -0700, by Pierre-Yves David
-
largefiles: remove a mutable default argumentThu, 24 Sep 2015 00:44:59 -0700, by Pierre-Yves David
-
largefiles: remove a mutable default argumentThu, 24 Sep 2015 00:44:32 -0700, by Pierre-Yves David
-
largefiles: remove a mutable default argumentThu, 24 Sep 2015 00:41:43 -0700, by Pierre-Yves David
-
largefiles: remove a mutable default argumentThu, 24 Sep 2015 00:40:53 -0700, by Pierre-Yves David
-
histedit: remove a mutable default argumentThu, 24 Sep 2015 00:38:34 -0700, by Pierre-Yves David
-
templater: remove a mutable default argumentThu, 24 Sep 2015 01:07:09 -0700, by Pierre-Yves David
-
templater: remove a mutable default argumentThu, 24 Sep 2015 01:06:41 -0700, by Pierre-Yves David
-
templater: remove a mutable default argumentThu, 24 Sep 2015 01:06:10 -0700, by Pierre-Yves David
-
templater: remove a mutable default argumentThu, 24 Sep 2015 01:05:21 -0700, by Pierre-Yves David
-
templater: remove a mutable default argumentThu, 24 Sep 2015 01:04:58 -0700, by Pierre-Yves David
-
addremove: remove a mutable default argumentThu, 24 Sep 2015 01:04:10 -0700, by Pierre-Yves David
-
match: remove a mutable default argumentThu, 24 Sep 2015 01:00:43 -0700, by Pierre-Yves David
-
match: remove a mutable default argumentThu, 24 Sep 2015 01:00:25 -0700, by Pierre-Yves David
-
match: remove a mutable default argumentThu, 24 Sep 2015 01:00:05 -0700, by Pierre-Yves David
-
match: remove a mutable default argumentThu, 24 Sep 2015 00:59:26 -0700, by Pierre-Yves David
-
addremove: remove a mutable default argumentThu, 24 Sep 2015 01:58:33 -0700, by Pierre-Yves David
-
tag: remove a mutable default argumentThu, 24 Sep 2015 00:56:30 -0700, by Pierre-Yves David
-
commit: remove a mutable default argumentThu, 24 Sep 2015 00:56:18 -0700, by Pierre-Yves David
-
lock: move acquirefn call to inside the lockTue, 22 Sep 2015 14:09:42 -0700, by Siddharth Agarwal
-
localrepo: call lock.lock with releasefn as a keyword argTue, 22 Sep 2015 13:25:41 -0700, by Siddharth Agarwal
-
copies: move debug statement to appropriate placeWed, 19 Aug 2015 15:11:17 -0500, by Matt Mackall
-
bidmerge: choose shortest list of diverge and rename/delete warningsWed, 19 Aug 2015 14:05:42 -0500, by Matt Mackall
-
copies: rename diverge2 to divergeset for clarityWed, 19 Aug 2015 14:04:54 -0500, by Matt Mackall
-
copies: begin separating mergecopies sidesWed, 19 Aug 2015 13:40:18 -0500, by Matt Mackall
-
copies: rename ctx() to getfctx() for clarityWed, 19 Aug 2015 13:09:54 -0500, by Matt Mackall
-
monoblue: port code selection without line numbers from gitwebWed, 23 Sep 2015 16:02:35 +0800, by Anton Shestakov
-
help: copy-edit description of ui.supportcontactTue, 22 Sep 2015 15:10:24 -0500, by Kevin Bullock
-
ui: avoid mutable default argumentsTue, 22 Sep 2015 16:56:34 -0700, by Siddharth Agarwal
-
util: avoid mutable default argumentsTue, 22 Sep 2015 16:55:18 -0700, by Siddharth Agarwal
-
obsstore: fast path to check if obsstore is emptySun, 13 Sep 2015 18:01:01 +0900, by Yuya Nishihara
-
obsstore: delay loading markers from obsstore fileSun, 13 Sep 2015 17:52:37 +0900, by Yuya Nishihara
-
obsstore: initialize _all markers without using _addmarkers()Sun, 13 Sep 2015 17:47:18 +0900, by Yuya Nishihara
-
revset: avoid implicit None testing in revsetWed, 23 Sep 2015 00:41:07 -0700, by Pierre-Yves David
-
revset: speed up existence checks for ordered filtered setsSun, 20 Sep 2015 16:53:42 -0700, by Durham Goode
-
revset: remove existence check from min() and max()Sun, 20 Sep 2015 19:27:53 -0700, by Durham Goode
-
update: move default destination into a revsetFri, 18 Sep 2015 17:23:10 -0700, by Pierre-Yves David
-
merge: move default destination computation in a revsetThu, 17 Sep 2015 14:03:15 -0700, by Pierre-Yves David
-
mergecmd: simplify conditionalThu, 17 Sep 2015 12:44:52 -0700, by Pierre-Yves David
-
rebase: move destination computation in a revsetThu, 17 Sep 2015 10:59:52 -0700, by Pierre-Yves David
-
debian: include bash completions in mercurial-commonTue, 22 Sep 2015 14:47:18 -0400, by Augie Fackler
-
debian: install hgk as part of mercurial-common (issue4829)Tue, 22 Sep 2015 14:32:17 -0400, by Augie Fackler
-
debian: install config files as part of mercurial-commonTue, 22 Sep 2015 14:14:05 -0400, by Augie Fackler
-
debian: configuration so that cacerts is properly loadedTue, 22 Sep 2015 14:31:17 -0400, by Augie Fackler
-
debian: install hg-ssh to /usr/bin just like downstreamTue, 22 Sep 2015 14:13:07 -0400, by Augie Fackler
-
highlight: remove temporary hack to overwrite repo.getcwdSun, 20 Sep 2015 20:13:27 +0900, by Yuya Nishihara
-
hgweb: overwrite cwd to resolve file patterns relative to repo (issue4568)Sun, 20 Sep 2015 20:11:31 +0900, by Yuya Nishihara
-
dirstate: state that getcwd() shouldn't be used to get real file pathSun, 20 Sep 2015 20:08:22 +0900, by Yuya Nishihara
-
merge: move merge step to the endWed, 16 Sep 2015 12:36:21 -0700, by Siddharth Agarwal
-
lock: factor out lock testing into a separate functionWed, 16 Sep 2015 19:52:06 -0700, by Siddharth Agarwal
-
lock: factor code to read lock into a separate functionWed, 16 Sep 2015 19:26:59 -0700, by Siddharth Agarwal
-
tests: add unit tests for locking codeThu, 17 Sep 2015 15:38:00 -0700, by Siddharth Agarwal
-
gitweb: port code selection without line numbers from paperTue, 22 Sep 2015 02:09:10 +0800, by Anton Shestakov
-
obsolete: remove unused _knownrevs functionSun, 13 Sep 2015 22:34:58 +0900, by Yuya Nishihara
-
bookmark: do not crash when active bookmark is forward and --date is usedThu, 17 Sep 2015 16:08:10 -0700, by Pierre-Yves David
-
bookmark: actually test update behavior in both casesThu, 17 Sep 2015 17:17:54 -0700, by Pierre-Yves David
-
coal: reuse style-paper.css and use a separate css file for visual tweaksFri, 18 Sep 2015 14:03:32 +0800, by Anton Shestakov
-
coal: reuse all templates from paper/map by %including the fileFri, 18 Sep 2015 01:06:27 +0800, by Anton Shestakov
-
help/config: reword committemplate external editor textFri, 04 Sep 2015 05:40:52 -0400, by timeless
-
help/config: reword committemplate multibyte character textFri, 04 Sep 2015 05:40:37 -0400, by timeless
-
help/config: use :hg:`help config....` notationFri, 28 Aug 2015 15:43:14 -0400, by timeless
-
help/config: omit True or FalseFri, 28 Aug 2015 15:24:58 -0400, by timeless
-
help/config: capitalize itemsFri, 28 Aug 2015 15:13:28 -0400, by timeless
-
tests: add more doctests for check-translation deprecatedThu, 17 Sep 2015 21:20:35 -0400, by timeless
-
tests: cleanup check-translation deprecatedThu, 17 Sep 2015 21:20:17 -0400, by timeless
-
gitweb: add author to filelogentryFri, 18 Sep 2015 14:24:53 +0800, by Anton Shestakov
-
monoblue: add author to filelogentryFri, 18 Sep 2015 14:24:38 +0800, by Anton Shestakov
-
monoblue: split a long line in filelogentry templateFri, 18 Sep 2015 14:23:44 +0800, by Anton Shestakov
-
readbundle: fix typo of None compressionFri, 18 Sep 2015 21:32:43 +0900, by Yuya Nishihara
-
readbundle: map 'HG10UN' to None compressionFri, 11 Sep 2015 17:06:56 -0700, by Pierre-Yves David
-
getsubset: use None to request uncompressed changegroupFri, 11 Sep 2015 17:06:02 -0700, by Pierre-Yves David
-
bundle: use None when unpacking uncompressed changegroupFri, 11 Sep 2015 17:05:46 -0700, by Pierre-Yves David
-
writebundle: use 'None' instead of 'UN' for the bundle2 caseTue, 15 Sep 2015 17:43:54 -0700, by Pierre-Yves David
-
compression: use 'None' for no-compressionTue, 15 Sep 2015 17:53:28 -0700, by Pierre-Yves David
-
changegroup: move all compressions utilities in utilTue, 15 Sep 2015 17:35:32 -0700, by Pierre-Yves David
-
obsolete: clarify that 'successorssets' returns the latest successorsTue, 15 Sep 2015 13:12:03 -0700, by Pierre-Yves David
-
obsolete: drop an empty line at the end of a docstringTue, 15 Sep 2015 13:10:25 -0700, by Pierre-Yves David
-
traceback: allow providing a local support contact pointFri, 11 Sep 2015 12:45:19 -0700, by Pierre-Yves David
-
dispatch: pre-indent the extensions blaming logicThu, 17 Sep 2015 11:50:55 -0700, by Pierre-Yves David
-
tests: check for inconsistently translated DEPRECATEDThu, 17 Sep 2015 07:49:18 -0400, by timeless
-
i18n-fr: reject translation which is missing DEPRECATEDThu, 17 Sep 2015 07:33:21 -0400, by timeless
-
i18n-pt_BR: select a single definition of DEPRECATEDThu, 17 Sep 2015 07:47:30 -0400, by timeless
-
i18n-sv: select a single definition of DEPRECATEDThu, 17 Sep 2015 07:37:20 -0400, by timeless
-
i18n-ro: use ()s instead of [] for DEPRECATEDThu, 17 Sep 2015 07:34:27 -0400, by timeless
-
i18n-ro: include translation of DEPRECATEDThu, 17 Sep 2015 07:34:13 -0400, by timeless
-
i18n-zh_CN: include translation of DEPRECATEDThu, 17 Sep 2015 07:35:03 -0400, by timeless
-
i18n-it: include translation of DEPRECATEDThu, 17 Sep 2015 07:33:44 -0400, by timeless
-
i18n-da: include translation of DEPRECATEDThu, 17 Sep 2015 07:32:28 -0400, by timeless
-
test-i18n: always run non gettext testsThu, 17 Sep 2015 07:31:07 -0400, by timeless
-
localrepo: refresh filecache stats only if transaction finished successfullyTue, 15 Sep 2015 00:32:39 +0900, by Yuya Nishihara
-
localrepo: move closure of lock release to classTue, 15 Sep 2015 21:00:28 +0900, by Yuya Nishihara
-
highlight: add highlightfiles config option which takes a fileset (issue3005)Wed, 16 Sep 2015 22:30:36 +0800, by Anton Shestakov
-
posix: shellquote do not require quoting for "+" (issue4818)Fri, 04 Sep 2015 11:15:02 -0400, by timeless
-
hgweb: consume generator inside context manager (issue4756)Sat, 12 Sep 2015 12:16:39 -0700, by Gregory Szorc
-
histedit: use one editor when multiple folds happen in a row (issue3524) (BC)Thu, 27 Aug 2015 14:46:26 -0400, by Augie Fackler
-
hgweb: replace .sourcelast with .bottomline that does the sameMon, 14 Sep 2015 18:41:09 +0800, by Anton Shestakov
-
coal: copy newer things from paperSun, 13 Sep 2015 21:01:34 +0800, by Anton Shestakov
-
revlog: optionally cache the full text when adding revisionsSat, 12 Sep 2015 16:11:17 -0700, by Gregory Szorc
-
revlog: drop local assignment of cache variableSat, 12 Sep 2015 15:16:47 -0700, by Gregory Szorc
-
revlog: rename generic "i" variable to "indexdata"Sat, 12 Sep 2015 12:47:00 -0700, by Gregory Szorc
-
hg: always create new localrepository instanceSat, 12 Sep 2015 11:31:56 -0700, by Gregory Szorc
-
test-bad-extension: reduce dependencies on other thingsThu, 10 Sep 2015 19:45:46 -0400, by timeless
-
help: fix help argument parsing and documentationThu, 10 Sep 2015 20:22:37 -0400, by timeless
-
minirst: establish leveling for nested definitionsThu, 10 Sep 2015 10:48:20 -0400, by timeless
-
dispatch: use the right context manager to deactivate demandimportSun, 13 Sep 2015 16:30:21 -0400, by Jordi Gutiérrez Hermoso
-
ui: improve docs on ui.logThu, 10 Sep 2015 10:50:03 -0400, by Augie Fackler
-
templater: switch ctx of list expression to rev of revset() (BC)Sat, 12 Sep 2015 00:21:41 +0900, by Yuya Nishihara
-
fileset: handle error of string unescapingThu, 10 Sep 2015 23:32:36 +0900, by Yuya Nishihara
-
revset: handle error of string unescapingThu, 10 Sep 2015 23:29:55 +0900, by Yuya Nishihara
-
parser: move unescape helper from templaterThu, 10 Sep 2015 23:25:10 +0900, by Yuya Nishihara
-
unionrepo: take delta base in account with building unified revlogThu, 10 Sep 2015 16:14:39 -0700, by Pierre-Yves David
-
extdiff: enable -I/-X with --patchWed, 09 Sep 2015 22:27:48 -0400, by Matt Harbison
-
extdiff: add a --patch argument for diffing changeset deltasWed, 09 Sep 2015 21:07:38 -0400, by Matt Harbison
-
extdiff: prepare sections of dodiff() for conditionalizingWed, 09 Sep 2015 20:48:09 -0400, by Matt Harbison
-
hgweb: drop unused importFri, 11 Sep 2015 12:48:09 -0700, by Matt Mackall
-
help/config: back out 5f2a1ebd6e78Thu, 10 Sep 2015 13:45:00 -0400, by Augie Fackler
-
filemerge: add non-interactive :merge-local and :merge-otherThu, 10 Sep 2015 09:41:11 -0400, by Jordi Gutiérrez Hermoso
-
simplemerge: enable option to resolve conflicts one wayWed, 12 Aug 2015 08:53:01 -0400, by Jordi Gutiérrez Hermoso