Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
mercurial-devel
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mercurial
mercurial-devel
Commits
5402fd9d
Commit
5402fd9d
authored
13 years ago
by
Matt Mackall
Browse files
Options
Downloads
Plain Diff
merge with stable
parents
2a7fa7c6
7f01ad70
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
mercurial/merge.py
+2
-2
2 additions, 2 deletions
mercurial/merge.py
mercurial/windows.py
+3
-4
3 additions, 4 deletions
mercurial/windows.py
with
5 additions
and
6 deletions
mercurial/merge.py
+
2
−
2
View file @
5402fd9d
...
...
@@ -7,7 +7,7 @@
from
node
import
nullid
,
nullrev
,
hex
,
bin
from
i18n
import
_
import
scmutil
,
util
,
filemerge
,
copies
,
subrepo
,
encoding
import
scmutil
,
util
,
filemerge
,
copies
,
subrepo
import
errno
,
os
,
shutil
class
mergestate
(
object
):
...
...
@@ -100,7 +100,7 @@
"
check for case folding collisions in the destination context
"
folded
=
{}
for
fn
in
mctx
:
fold
=
encoding
.
lower
(
fn
)
fold
=
util
.
normcase
(
fn
)
if
fold
in
folded
:
raise
util
.
Abort
(
_
(
"
case-folding collision between %s and %s
"
)
%
(
fn
,
folded
[
fold
]))
...
...
This diff is collapsed.
Click to expand it.
mercurial/windows.py
+
3
−
4
View file @
5402fd9d
...
...
@@ -140,7 +140,7 @@
'''
# TODO: There may be a more clever way to do this that also handles other,
# less common file systems.
return
os
.
path
.
normpath
(
os
.
path
.
normcase
(
os
.
path
.
realpath
(
path
)))
return
os
.
path
.
normpath
(
normcase
(
os
.
path
.
realpath
(
path
)))
def
samestat
(
s1
,
s2
):
return
False
...
...
@@ -216,6 +216,5 @@
def
statfiles
(
files
):
'''
Stat each file in files and yield stat or None if file does not exist.
Cluster and cache stat per directory to minimize number of OS stat calls.
'''
ncase
=
os
.
path
.
normcase
dircache
=
{}
# dirname -> filename -> status | None if file does not exist
for
nf
in
files
:
...
...
@@ -220,9 +219,9 @@
dircache
=
{}
# dirname -> filename -> status | None if file does not exist
for
nf
in
files
:
nf
=
ncase
(
nf
)
nf
=
n
orm
case
(
nf
)
dir
,
base
=
os
.
path
.
split
(
nf
)
if
not
dir
:
dir
=
'
.
'
cache
=
dircache
.
get
(
dir
,
None
)
if
cache
is
None
:
try
:
...
...
@@ -223,10 +222,10 @@
dir
,
base
=
os
.
path
.
split
(
nf
)
if
not
dir
:
dir
=
'
.
'
cache
=
dircache
.
get
(
dir
,
None
)
if
cache
is
None
:
try
:
dmap
=
dict
([(
ncase
(
n
),
s
)
dmap
=
dict
([(
n
orm
case
(
n
),
s
)
for
n
,
k
,
s
in
osutil
.
listdir
(
dir
,
True
)])
except
OSError
,
err
:
# handle directory not found in Python version prior to 2.5
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment