Patchwork [2,of,6] basectx: add missing, merge, and branch args to dirty method

login
register
mail settings
Submitter Sean Farley
Date Aug. 6, 2014, 8:42 p.m.
Message ID <834969abe553deadc807.1407357728@178.1.168.192.in-addr.arpa>
Download mbox | patch
Permalink /patch/5296/
State Accepted
Headers show

Comments

Sean Farley - Aug. 6, 2014, 8:42 p.m.
# HG changeset patch
# User Sean Farley <sean.michael.farley@gmail.com>
# Date 1403062011 25200
#      Tue Jun 17 20:26:51 2014 -0700
# Node ID 834969abe553deadc8072b18561bdbfe4d1071bb
# Parent  7770641d319fa262b78efb8b3fb470f336997561
basectx: add missing, merge, and branch args to dirty method

This fixes a discrepency for basectx and classes that inherit from it. Now
callers can pass these arguments to any context without an exception being
raised.

Patch

diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -274,11 +274,11 @@  class basectx(object):
         return scmutil.dirs(self._manifest)
 
     def dirs(self):
         return self._dirs
 
-    def dirty(self):
+    def dirty(self, missing=False, merge=True, branch=True):
         return False
 
     def status(self, other=None, match=None, listignored=False,
                listclean=False, listunknown=False, listsubrepos=False):
         """return status of files between two nodes or node and working