upstream/mercurial-mirror Files · tests/test-wireproto.py

merge: don't report progress for dr/rd actions...

merge: don't report progress for dr/rd actions It is easier to reason about certain algorithms in terms of a file->action mapping than the current action->list-of-files. Bid merge is already written this way (but with a list of actions per file), and largefiles' overridecalculateupdates() will also benefit. However, that requires us to have at most one action per file. That requirement is currently violated by 'dr' (divergent rename) and 'rd' (rename and delete) actions, which can exist for the same file as some other action. These actions are only used for displaying warnings to the user; they don't change anything in the working copy or the dirstate. In this way, they are similar to the 'k' (keep) action. However, they are even less action-like than 'k' is: 'k' at least describes what to do with the file ("do nothing"), while 'dr' and 'rd' or only annotations for files for which there may exist other, "real" actions. As a first step towards separating these acitons out, stop including them in the progress output, just like we already exclude the 'k' action.

Augie Fackler - - Load All Authors

File last commit:

r20686:c69f6290 default


                r23524:a1a7c94d

default

Download file

             test-wireproto.py
        
                    48 lines
            
             | 1.2 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / test-wireproto.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      from mercurial import wireproto

      class proto(object):

          def __init__(self, args):

              self.args = args

          def getargs(self, spec):

              args = self.args

              args.setdefault('*', {})

              names = spec.split()

              return [args[n] for n in names]

      class clientpeer(wireproto.wirepeer):

          def __init__(self, serverrepo):

              self.serverrepo = serverrepo

          def _call(self, cmd, **args):

              return wireproto.dispatch(self.serverrepo, proto(args), cmd)

          @wireproto.batchable

          def greet(self, name):

              f = wireproto.future()

              yield {'name': mangle(name)}, f

              yield unmangle(f.value)

      class serverrepo(object):

          def greet(self, name):

              return "Hello, " + name

          def filtered(self, name):

              return self

      def mangle(s):

          return ''.join(chr(ord(c) + 1) for c in s)

      def unmangle(s):

          return ''.join(chr(ord(c) - 1) for c in s)

      def greet(repo, proto, name):

          return mangle(repo.greet(unmangle(name)))

      wireproto.commands['greet'] = (greet, 'name',)

      srv = serverrepo()

      clt = clientpeer(srv)

      print clt.greet("Foobar")

      b = clt.batch()

      fs = [b.greet(s) for s in ["Fo, =;o", "Bar"]]

      b.submit()

      print [f.value for f in fs]

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				from mercurial import wireproto

				class proto(object):
				def __init__(self, args):
				self.args = args
				def getargs(self, spec):
				args = self.args
				args.setdefault('*', {})
				names = spec.split()
				return [args[n] for n in names]

				class clientpeer(wireproto.wirepeer):
				def __init__(self, serverrepo):
				self.serverrepo = serverrepo
				def _call(self, cmd, **args):
				return wireproto.dispatch(self.serverrepo, proto(args), cmd)

				@wireproto.batchable
				def greet(self, name):
				f = wireproto.future()
				yield {'name': mangle(name)}, f
				yield unmangle(f.value)

				class serverrepo(object):
				def greet(self, name):
				return "Hello, " + name

				def filtered(self, name):
				return self

				def mangle(s):
				return ''.join(chr(ord(c) + 1) for c in s)
				def unmangle(s):
				return ''.join(chr(ord(c) - 1) for c in s)

				def greet(repo, proto, name):
				return mangle(repo.greet(unmangle(name)))

				wireproto.commands['greet'] = (greet, 'name',)

				srv = serverrepo()
				clt = clientpeer(srv)

				print clt.greet("Foobar")
				b = clt.batch()
				fs = [b.greet(s) for s in ["Fo, =;o", "Bar"]]
				b.submit()
				print [f.value for f in fs]