Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eden/scm/sapling/crecord.py
Original file line number Diff line number Diff line change
Expand Up @@ -1289,7 +1289,7 @@ def printitem(
self, item=None, ignorefolding=False, recursechildren=True, towin=True
):
"""
use __printitem() to print the the specified item.applied.
use __printitem() to print the specified item.applied.
if item is not specified, then print the entire patch.
(hiding folded elements, etc. -- see __printitem() docstring)
"""
Expand Down
2 changes: 1 addition & 1 deletion eden/scm/sapling/ext/rebase.py
Original file line number Diff line number Diff line change
Expand Up @@ -1263,7 +1263,7 @@ def rebase(ui, repo, templ=None, **opts):
singletransaction = True

By default, rebase writes to the working copy, but you can configure it
to run in-memory for for better performance, and to allow it to run if the
to run in-memory for better performance, and to allow it to run if the
current checkout is dirty::

[rebase]
Expand Down
2 changes: 1 addition & 1 deletion eden/scm/sapling/patch.py
Original file line number Diff line number Diff line change
Expand Up @@ -2948,7 +2948,7 @@ def diffui(*args, **kw):

def _filepairs(ctx1, ctx2, modified, added, removed, copy, opts):
"""generates tuples (f1, f2, copyop), where f1 is the name of the file
before and f2 is the the name after. For added files, f1 will be None,
before and f2 is the name after. For added files, f1 will be None,
and for removed files, f2 will be None. copyop may be set to None, 'copy'
or 'rename' (the latter two only if opts.git is set)."""
gone = set()
Expand Down
2 changes: 1 addition & 1 deletion eden/scm/sapling/peer.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class batcher:
"""base class for batches of commands submittable in a single request

All methods invoked on instances of this class are simply queued and
return a a future for the result. Once you call submit(), all the queued
return a future for the result. Once you call submit(), all the queued
calls are performed and the results set in their respective futures.
"""

Expand Down
2 changes: 1 addition & 1 deletion eden/scm/sapling/transaction.py
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ def addfilegenerator(self, genid, filenames, genfunc, order=0, location=""):
generator will be executed.

The `location` arguments may be used to indicate the files are located
outside of the the standard directory for transaction. It should match
outside of the standard directory for transaction. It should match
one of the key of the `transaction.vfsmap` dictionary.

In a lockfree transaction, filenames must be tracked by metalog.
Expand Down