[PATCH 3 of 4 mergedriver] mergestate.commit: factor out making the list of records
Siddharth Agarwal
sid0 at fb.com
Wed Nov 18 06:41:38 UTC 2015
# HG changeset patch
# User Siddharth Agarwal <sid0 at fb.com>
# Date 1447799006 28800
# Tue Nov 17 14:23:26 2015 -0800
# Node ID 5a8a002259aa129e3c3a332df860d09db62c2964
# Parent 631058f5fee42e8a0b719807a97bf40903df7551
# Available At http://42.netv6.net/sid0-wip/hg/
# hg pull http://42.netv6.net/sid0-wip/hg/ -r 5a8a002259aa
mergestate.commit: factor out making the list of records
Will aid in testing.
diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -286,20 +286,24 @@ class mergestate(object):
def commit(self):
"""Write current state on disk (if necessary)"""
if self._dirty:
- records = []
- records.append(('L', hex(self._local)))
- records.append(('O', hex(self._other)))
- if self.mergedriver:
- records.append(('m', '\0'.join([
- self.mergedriver, self._mdstate])))
- for d, v in self._state.iteritems():
- if v[0] == 'd':
- records.append(('D', '\0'.join([d] + v)))
- else:
- records.append(('F', '\0'.join([d] + v)))
+ records = self._makerecords()
self._writerecords(records)
self._dirty = False
+ def _makerecords(self):
+ records = []
+ records.append(('L', hex(self._local)))
+ records.append(('O', hex(self._other)))
+ if self.mergedriver:
+ records.append(('m', '\0'.join([
+ self.mergedriver, self._mdstate])))
+ for d, v in self._state.iteritems():
+ if v[0] == 'd':
+ records.append(('D', '\0'.join([d] + v)))
+ else:
+ records.append(('F', '\0'.join([d] + v)))
+ return records
+
def _writerecords(self, records):
"""Write current state on disk (both v1 and v2)"""
self._writerecordsv1(records)
More information about the Mercurial-devel
mailing list