[PATCH 1 of 7 V4] revert: allow configuring the .orig file location

Matt Mackall mpm at selenic.com
Thu Nov 12 17:05:29 CST 2015


On Tue, 2015-11-10 at 16:59 -0800, cdelahousse at fb.com wrote:
> # HG changeset patch
> # User Christian Delahousse <cdelahousse at fb.com>
> # Date 1447194103 28800
> #      Tue Nov 10 14:21:43 2015 -0800
> # Node ID 5ee6aa63a694b3f8b4aba1c7b23561fba77dd78b
> # Parent  8b2fbe3f59b1b969878691cb472369ad0067f165
> revert: allow configuring the .orig file location
> 
> Adding support for a 'origbackuppath' entry under section [ui] in the
> configuration file.  It allows user to specify where .orig files
> should be
> stored relative to the repo.  In case of no origbackuppath entry, we
> fallback to
> the default behaviour of moving old versions of a file to a file name
> <oldpath>.orig. This will prevent cluttering the working copy.
> 
> The cmdutil._origpath function will continue to used in this series
> of patches.

This series looks good in total but the first few patches are messy.
I've rearranged them thusly:

patch 1: introduce function with final name and docs
patch 2: add a user
patch 3: add a user
...

-- 
Mathematics is the supreme nostalgia of our time.



More information about the Mercurial-devel mailing list