This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	marmoute	D12119 narrow: allow merging non-conflicting change outside of the narrow spec
Closed	marmoute	D12118 merge-actions: add some information about the "changes" the action do
Closed	marmoute	D12117 merge-actions: have an attribute for narrow safetiness
Closed	marmoute	D12116 merge-actions: add an explicite "no_op" attribute
Closed	marmoute	D12115 merge-actions: gather all created action into a set
Closed	marmoute	D12114 merge-actions: make merge action a full featured object
Closed	marmoute	D12113 convert: use the merge action constant
Closed	marmoute	D12112 large-file: use the merge action constant
Closed	marmoute	D12111 merge: stop using merge action for pathconflict option
Closed	marmoute	D12110 merge: break up a not-so-one-liner for readability
Closed	marmoute	D12109 merge: break up a not-so-one-liner for readability
Closed	marmoute	D12108 merge: break up a not-so-one-liner for readability
Closed	marmoute	D12107 merge: break up a not-so-one-liner for readability
Closed	marmoute	D12106 merge: break up two not-so-one-liner for extra readability
Closed	marmoute	D12105 merge: break up a not-so-one-liner for readability
Closed	marmoute	D12104 merge: break up a not-so-one-liner for readability
Closed	marmoute	D12103 merge: break up a not-so-one-liner for readability
Closed	marmoute	D12102 merge: break up a not-so-one-liner for readability
Closed	marmoute	D12101 merge: break up a not-so-one-liner for readability

Diff 32011

	from __future__ import absolute_import			from __future__ import absolute_import

	import collections			import collections
	import errno			import errno
	import shutil			import shutil
	import struct			import struct
				import weakref

	from .i18n import _			from .i18n import _
	from .node import (			from .node import (
	bin,			bin,
	hex,			hex,
	nullrev,			nullrev,
	)			)
	from . import (			from . import (
	class MergeAction(object):			class MergeAction(object):
	"""represent an "action" merge need to take for a given file			"""represent an "action" merge need to take for a given file

	Attributes:			Attributes:

	_short: internal representation used to identify each action			_short: internal representation used to identify each action
	"""			"""

				ALL_ACTIONS = weakref.WeakSet()

	def __init__(self, short):			def __init__(self, short):
	self._short = short			self._short = short
				self.ALL_ACTIONS.add(self)

	def __hash__(self):			def __hash__(self):
	return hash(self._short)			return hash(self._short)

	def __repr__(self):			def __repr__(self):
	return 'MergeAction<%s>' % self._short.decode('ascii')			return 'MergeAction<%s>' % self._short.decode('ascii')

	def __bytes__(self):			def __bytes__(self):