Mercurial > hg
graph
-
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