Mercurial: revision graph

graph

less more | rev 27054: (0) -10000 -3000 -1000 -120 +120 +1000 +3000 +10000 tip

test-import: don't use printf to append an extension to $HGRCPATH
Mon, 16 Nov 2015 14:12:27 -0500, by Matt Harbison
test-ssh: stop quoting dummyssh invocation for Windows
Mon, 16 Nov 2015 13:44:27 -0500, by Matt Harbison
strip: use repo._bookmarks.recordchange instead of repo._bookmarks.write
Fri, 20 Nov 2015 13:46:36 -0800, by Laurent Charignon
histedit: make use of bookmarks.recordchange instead of bookmarks.write
Fri, 20 Nov 2015 13:23:47 -0800, by Laurent Charignon
largefiles: fall back to the original for change/delete conflicts
Wed, 18 Nov 2015 17:40:13 -0800, by Siddharth Agarwal
mergestate.add: store absentfilectxes as nullhex
Sat, 14 Nov 2015 00:07:11 -0800, by Siddharth Agarwal
mergestate._resolve: handle change/delete conflicts
Fri, 20 Nov 2015 01:14:15 -0800, by Siddharth Agarwal
filemerge: don't try to copy files known to be absent
Sat, 14 Nov 2015 00:00:46 -0800, by Siddharth Agarwal
hgweb: use absolute_import
Sat, 31 Oct 2015 22:07:40 +0900, by Yuya Nishihara
hgweb: import wsgicgi at top level
Sun, 01 Nov 2015 15:09:35 +0900, by Yuya Nishihara
hgweb: import BaseHTTPServer as module at top level
Sun, 01 Nov 2015 15:07:08 +0900, by Yuya Nishihara
hgweb: do not import hgweb_mod.hgweb and .makebreadcrumb as symbol
Sun, 01 Nov 2015 14:23:23 +0900, by Yuya Nishihara
filemerge: don't try using external tools on change/delete conflicts
Fri, 13 Nov 2015 23:57:43 -0800, by Siddharth Agarwal
filemerge: don't attempt to premerge change/delete conflicts
Fri, 13 Nov 2015 23:56:00 -0800, by Siddharth Agarwal
filemerge._mergecheck: add check for change/delete conflicts
Fri, 13 Nov 2015 23:58:05 -0800, by Siddharth Agarwal
filemerge._picktool: only pick from nomerge tools for change/delete conflicts
Sun, 15 Nov 2015 21:40:15 -0800, by Siddharth Agarwal
filemerge: add support for change/delete conflicts to the ':prompt' tool
Fri, 13 Nov 2015 23:52:26 -0800, by Siddharth Agarwal
filemerge: add support for change/delete conflicts to the ':other' merge tool
Wed, 18 Nov 2015 15:41:50 -0800, by Siddharth Agarwal
filemerge: add support for change/delete conflicts to the ':local' merge tool
Wed, 18 Nov 2015 15:40:28 -0800, by Siddharth Agarwal
merge.mergestate: compute dirstate action
Thu, 19 Nov 2015 10:50:02 -0800, by Siddharth Agarwal
filemerge: return whether the file was deleted
Wed, 18 Nov 2015 14:22:52 -0800, by Siddharth Agarwal
filemerge: return whether the file is deleted from all other merge tools
Wed, 18 Nov 2015 13:55:31 -0800, by Siddharth Agarwal
filemerge: return whether the file is deleted for nomerge internal tools
Wed, 18 Nov 2015 13:52:28 -0800, by Siddharth Agarwal
mergestate: allow storing and retrieving change/delete conflicts
Wed, 18 Nov 2015 15:46:45 -0800, by Siddharth Agarwal
strip: changing bookmark argument to be a list
Thu, 19 Nov 2015 12:50:10 +0530, by Shubhanshu Agrawal
strip: strip a list of bookmarks
Sun, 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 specially
Wed, 18 Nov 2015 15:46:45 -0800, by Siddharth Agarwal
test-resolve.t: remove completely unnecessary line
Wed, 18 Nov 2015 23:42:32 -0800, by Siddharth Agarwal
resolve: fix incorrect merge
Wed, 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 _readrecordsv2
Wed, 18 Nov 2015 16:39:30 -0800, by Siddharth Agarwal
unshelve: add support for custom merge tools
Wed, 18 Nov 2015 15:11:23 -0800, by Siddharth Agarwal
unshelve: shed spurious space
Wed, 18 Nov 2015 15:18:16 -0800, by Siddharth Agarwal
unshelve: add -k as short form of --keep
Wed, 18 Nov 2015 15:04:03 -0800, by Siddharth Agarwal
import-checker: allow symbol imports from hgweb.common and .request
Sun, 01 Nov 2015 13:55:21 +0900, by Yuya Nishihara
perf: un-bitrot perfstatus
Thu, 19 Nov 2015 15:02:27 -0600, by Matt Mackall
util: drop statmtimesec
Thu, 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 expression
Wed, 18 Nov 2015 15:58:06 -0800, by Laurent Charignon
rebase: remove an unused todo
Wed, 18 Nov 2015 16:06:00 -0800, by Laurent Charignon
rebase: don't rebase obsolete commits with no successor
Wed, 18 Nov 2015 13:44:29 -0800, by Laurent Charignon
rebase: fix a typo in test-rebase-obsolete
Wed, 18 Nov 2015 13:46:42 -0800, by Laurent Charignon
merge with stable
Wed, 18 Nov 2015 20:59:17 -0600, by Matt Mackall
hgweb: unify import style of error classes
Sun, 01 Nov 2015 14:43:25 +0900, by Yuya Nishihara
hgweb: do not import templatefilters.revescape and websub as symbol
Sun, 01 Nov 2015 14:00:14 +0900, by Yuya Nishihara
hgweb: alias ui module as uimod
Sun, 01 Nov 2015 13:58:32 +0900, by Yuya Nishihara
mergestate.commit: factor out making the list of records
Tue, 17 Nov 2015 14:23:26 -0800, by Siddharth Agarwal
mergestate: move _read() call to read constructor
Tue, 17 Nov 2015 14:04:56 -0800, by Siddharth Agarwal
debugmergestate: explain why we create mergestate objects directly
Tue, 17 Nov 2015 14:22:30 -0800, by Siddharth Agarwal
debugdirstate: convert keyword parameters to **opts
Wed, 11 Nov 2015 13:28:00 -0800, by Christian Delahousse
convert: changed test's progress output format to ignore estimate
Tue, 17 Nov 2015 18:01:21 -0800, by Christian Delahousse
mq: use repo._bookmarks.recordchange instead of repo._bookmarks.write
Tue, 17 Nov 2015 13:12:33 -0800, by Laurent Charignon
mq: indentation change to make the next patch more legible
Tue, 17 Nov 2015 13:12:46 -0800, by Laurent Charignon
bookmarks: use repo._bookmarks.recordchange instead of repo._bookmarks.write
Tue, 17 Nov 2015 12:49:57 -0800, by Laurent Charignon
localrepo: put bookmark move following commit in one transaction
Wed, 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 disk
Tue, 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 state
Tue, 17 Nov 2015 17:00:54 -0800, by Siddharth Agarwal
mergestate: raise structured exception for unsupported merge records
Tue, 17 Nov 2015 14:11:52 -0800, by Siddharth Agarwal
error: add a structured exception for unsupported merge records
Tue, 17 Nov 2015 14:10:12 -0800, by Siddharth Agarwal
dirstate: back out 502b56a9e897
Tue, 17 Nov 2015 13:47:16 -0800, by Bryan O'Sullivan
osutil: make statfiles check for interrupts periodically
Tue, 17 Nov 2015 13:47:14 -0800, by Bryan O'Sullivan
osutil: don't leak on statfiles error
Tue, 17 Nov 2015 13:43:09 -0800, by Bryan O'Sullivan
histedit: extracts _isdirtywc function
Thu, 12 Nov 2015 12:44:15 +0100, by liscju
node: add 'nullhex', hex-encoded nullid
Mon, 16 Nov 2015 11:23:32 -0800, by Siddharth Agarwal
filemerge: introduce class whose objects represent files not in a context
Mon, 16 Nov 2015 11:45:35 -0800, by Siddharth Agarwal
filectx: add isabsent method
Mon, 16 Nov 2015 11:27:27 -0800, by Siddharth Agarwal
filectx: allow custom comparators
Fri, 13 Nov 2015 22:37:51 -0800, by Siddharth Agarwal
debugmergestate: print out record type for files
Fri, 13 Nov 2015 23:01:36 -0800, by Siddharth Agarwal
merge.applyupdates: don't return early if merge driver's conclude failed
Sun, 15 Nov 2015 22:45:20 -0800, by Siddharth Agarwal
convert: use repo._bookmarks.recordchange instead of repo._bookmarks.write
Mon, 16 Nov 2015 17:15:36 -0800, by Laurent Charignon
convert: indentation change to make the next patch more legible
Mon, 16 Nov 2015 17:14:15 -0800, by Laurent Charignon
strip: renaming local variables
Sun, 15 Nov 2015 20:27:27 +0530, by Shubhanshu Agrawal
test-rename-merge2: make selected output less arbitrary
Wed, 11 Feb 2015 22:22:29 -0800, by Martin von Zweigbergk
test-convert-git: drop a git warning that doesn't occur on Windows
Sun, 15 Nov 2015 22:11:23 -0500, by Matt Harbison
tests: fix globs for Windows
Sun, 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 roundtrip
Mon, 09 Nov 2015 22:31:01 +0900, by Yuya Nishihara
import-checker: reset context to verify convention in function scope
Sun, 01 Nov 2015 17:42:03 +0900, by Yuya Nishihara
import-checker: allow import of child modules from package root
Sun, 01 Nov 2015 00:37:22 +0900, by Yuya Nishihara
encoding: extend test cases for utf8b
Mon, 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' actions
Fri, 13 Nov 2015 14:24:22 -0800, by Siddharth Agarwal
rebase: add returning value from pullrebase function stable
Sun, 15 Nov 2015 22:18:48 +0100, by liscju
resolve: restore .orig only after merge is fully complete (issue4952) stable
Fri, 13 Nov 2015 15:56:02 -0800, by Siddharth Agarwal
monoblue: add a space to separate navigation links in file log footer
Fri, 06 Nov 2015 22:32:00 +0800, by Anton Shestakov
merge: move messages about possible conflicts a litte earlier
Thu, 12 Nov 2015 13:14:03 -0800, by Martin von Zweigbergk
import-checker: include lineno in warning message
Sun, 01 Nov 2015 15:46:06 +0900, by Yuya Nishihara
import-checker: extract function to generate a formatted warning
Sun, 01 Nov 2015 15:39:25 +0900, by Yuya Nishihara
import-checker: make it executable for convenience
Sun, 01 Nov 2015 13:53:05 +0900, by Yuya Nishihara
test-fileset: glob the updated file count for Windows stability
Mon, 09 Nov 2015 17:20:50 -0500, by Matt Harbison
tests: tolerate differences between Linux and Windows error strings
Mon, 09 Nov 2015 13:12:35 -0500, by Matt Harbison
test-largefiles-cache: add glob for Windows
Mon, 09 Nov 2015 12:51:58 -0500, by Matt Harbison
tests: make 'f' tool open files in binary mode when hexdumping
Mon, 09 Nov 2015 12:49:31 -0500, by Matt Harbison
merge.applyupdates: only attempt to merge files in mergeactions
Thu, 12 Nov 2015 14:29:02 -0800, by Siddharth Agarwal
filemerge: rename _symlinkcheck to _mergecheck
Wed, 11 Nov 2015 17:34:28 -0800, by Siddharth Agarwal
test-merge-prompt.t: rename to test-merge-changedelete.t
Wed, 11 Nov 2015 17:32:41 -0800, by Siddharth Agarwal
merge with stable
Thu, 12 Nov 2015 20:48:41 -0600, by Matt Mackall
tags: create new sortdict for performance reasons stable
Thu, 12 Nov 2015 13:16:04 -0800, by Gregory Szorc
largefiles: specify where .orig files are kept
Tue, 10 Nov 2015 15:08:56 -0800, by Christian Delahousse
mq: let the user choose where .orig files are kept
Tue, 10 Nov 2015 14:52:54 -0800, by Christian Delahousse
shelve: choose where .orig file locations are kept
Tue, 10 Nov 2015 14:41:14 -0800, by Christian Delahousse
filemerge: choose where .orig files are kept
Tue, 10 Nov 2015 16:25:59 -0800, by Christian Delahousse
git-subrepos: revert respects specified location to save .orig files
Tue, 10 Nov 2015 14:29:13 -0800, by Christian Delahousse
resolve: choose where .orig file locations are kept
Tue, 10 Nov 2015 14:26:19 -0800, by Christian Delahousse
revert: allow configuring the .orig file location
Thu, 12 Nov 2015 17:00:08 -0600, by Christian Delahousse
cmdutil: add origbackuppath helper
Thu, 12 Nov 2015 16:56:06 -0600, by Christian Delahousse
discovery: pass pushop to _nowarnheads
Tue, 10 Nov 2015 11:16:25 -0800, by Ryan McElroy
exchange: pass pushop to discovery.checkheads
Tue, 10 Nov 2015 11:13:21 -0800, by Ryan McElroy

less more | rev 27054: (0) -10000 -3000 -1000 -120 +120 +1000 +3000 +10000 tip

Mercurial > hg

graph