repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Turn off potentially slow label detection by default
2007-04-07
S
imon Hausmann
Turn of
f
potentially slow label
detecti
o
n by defau
l
t
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
S
i
mon Ha
u
s
m
ann
Provide a
tree summary afte
r
git-p
4
rebase
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon
Hausmann
Added g
i
t-p4 rebase convenience
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-01
Simon Hausmann
Clean up pyt
h
on class na
m
es
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-04-01
Simon Hausma
n
n
Fix "com
p
ilation" :)
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-29
Sim
o
n Haus
m
a
n
n
Fix the do
c
s fo
r
git-p4 submit an
d
turn git-p4
submit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-28
Simon Hausmann
Fi
x
variable usage in tag im
p
ort
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon Ha
u
smann
Added support fo
r
mapping p4 labels to git ta
g
s
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon Hausmann
g
it
-
p4
debug doesn't need a git reposi
t
ory
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-25
Simon Hausmann
Don't try to pars
e
any options with git-p4 d
e
b
u
g but
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Sim
o
n H
a
u
s
mann
Prefer git command over git-command
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
S
i
mon Hausmann
Minor cos
m
etic
f
ixl
e
t fo
r
t
h
e
g
i
t-p4
s
u
b
mit sync
q
uestion
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon Hau
s
mann
Different
v
ersio
n
s of p4 have di
f
f
e
r
ent out
p
ut fo
r
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-23
Simon Hausmann
Use
t
he new
i
n
cremental import
style by default
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-03-23
Simon Hausmann
Make it
possible to r
u
n git-p4
submit from within the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausman
n
Brand
new smart increment
a
l impo
r
t that doesn'
t
need
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
i
mon Hau
s
mann
Set the d
e
fault branch in run, not in the constructor
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Helper fun
c
tion t
o
check the exis
t
an
c
e of a revision
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Haus
m
ann
Added
s
ome helper fun
c
tion(s) to parse the
depot path
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon
H
ausmann
Changed t
h
e
d
efault br
a
nch for imports from "master
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon H
a
usmann
Changed the
f
o
rma
t
of the imported log mess
a
ge slightly
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Haus
m
ann
Remov
e
d
t
he
.
py ex
t
en
s
ion from git-p
4
as
i
t's
a
n
n
oying
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simo
n
Hausmann
Don't show the submit template and the dif
f
first in
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-21
Simon Ha
u
smann
Make it possib
l
e to in
v
oke git-p4
f
rom
with
i
n subdirector
i
es
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Sim
o
n Ha
u
smann
Made --apply-as-patch th
e
default for git
-
p4 submit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
S
i
mo
n
H
a
usmann
Fi
x
suppo
r
t
f
or deletions
in g
i
t-p4 su
b
mit whe
n
u
s
ing
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Sim
o
n Hausm
a
nn
Added
e
xperimental but su
p
er-fast -
-
apply-as-patch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Si
m
on Hausmann
Docu
m
ent
a
tion enhancements
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hau
s
mann
Start o
f
the git-p4
d
ocumentati
o
n
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Sim
o
n Hausmann
R
e
moved p
4
-fas
t
-export and p
4
-git-sync as t
h
e
y've been
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
S
i
m
on Hausmann
Fixed th
e
initial version import by
ge
t
ting
t
he
f
ile
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon H
a
u
s
mann
A
dded miss
i
ng "self"s to
ma
k
e th
e
scr
i
pt evaluate correc
t
ly
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Ha
u
sm
a
nn
Completely unt
e
st
e
d "merge
"
of p4-fast-export
.
py into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
S
imon
Hausmann
sync
-
to-perf
o
rce
i
s no
w
calle
d
submit and f
i
xed
t
h
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon H
a
usmann
Part of t
h
e
c
ode is co
p
yright by Troll
t
ech ASA
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
First
(
untested) attempt at migrating p4-git-sync i
n
t
o
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Si
m
on
H
ausmann
Pr
o
vide a lit
t
le
b
it
of help de
s
crip
t
ion for the
g
it
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon
Hausmann
St
a
rt mo
v
ing the
git-p4 tools
in
t
o one sin
g
l
e
scr
i
pt
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
Pass the right number of argumen
t
s to
c
o
m
m
it, f
i
xes
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
Im
p
roved
t
he git
d
i
r
detectio
n
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-16
Simon Hausmann
D
e
fa
u
l
t
to interactive syncing
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-15
Simon
H
au
s
m
ann
Use p4 re
v
e
rt
.
.
.
instea
d
of revert -
a
.
.
.
after submitti
n
g
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Si
m
on Hausmann
Auto-detect the c
u
rrent
g
it
b
ranc
h
befo
r
e
submitting
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausmann
I
g
nore Apple resource file
s
when importing
from perforce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simo
n
Ha
u
sman
n
Be
nice an
d
use /usr/bin
/
env pytho
n
for
th
e
git-p4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausma
n
n
Automa
t
ically ope
r
ate on a
te
m
porary branch, needed
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon Hausma
n
n
L
o
ts of bugfixes to p4-git
-
sy
n
c
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon Ha
u
smann
Fix git-d
i
r opt
i
on
a
n
d
al
l
ow readi
n
g log substitutions
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
Simon Hausmann
F
irst ve
r
sion of a new script to submit changes bac
k
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausma
n
n
Split
u
p
t
h
e
c
ache
c
ommandl
i
ne
o
ptio
n
s
into (c
o
mmand
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon
H
au
s
mann
Reduce the numb
e
r
of fa
l
se "m
e
rges" by s
k
ippin
g
"branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
i
m
o
n Haus
m
ann
More work on branch dete
c
t
i
o
n by implementin
g
c
hange
I
sB
r
anch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simo
n
Hausmann
M
o
re co
d
e cl
e
anups and preparations for more branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simo
n
Hausmann
Minor code cleanups
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Si
m
on Hau
s
m
a
n
n
M
a
k
e
the p4 d
a
t
a
/command cac
h
e configurable
through
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Fixed p4-debug file extensio
n
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-08
S
imon Hausm
a
nn
Ch
a
n
g
ed -
-
known-branch
e
s
to take
a
file as a
r
gument
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-08
Sim
o
n Hausmann
Work
i
n progre
s
s on
de
t
ectin
g
branches
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-07
S
i
mon
Hausmann
Adjust
t
he
ou
t
put parsing of git
name-rev to han
d
le
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Si
m
on Ha
u
smann
Don't
p
rint a plain newline at the end
o
f
t
he execution
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-22
S
imo
n
Hausmann
Mor
e
wo
r
k in --sil
e
n
t
support
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simo
n
Haus
m
ann
Added support for
-
-silent so that p
4
-fast-expor
t
can
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-21
Simon Hausmann
A
d
d
e
d p4 de
l
ete behavioural emula
t
ion as todo item
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-17
Simon
H
ausmann
Fix sin
g
l
e-
b
ranch imports by skipping th
e
b
r
anch/merge
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Simon Hausmann
Use
s
ets
.
Set() in
s
tead of s
e
t()
t
o run also
w
ith o
l
d
e
r
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Simon Hau
s
mann
M
a
k
e
i
t
possible to specify t
h
e
p4 changes to import
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-12
Simon Ha
u
smann
Whe
n
trying t
o
m
ap
p
4 integrations to git me
r
ges
just
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simo
n
Hausm
a
n
n
Set git fast-import ma
r
ks for every imported c
h
ang
e
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausman
n
Af
t
er marking
a
p4 bran
c
h as merged don't ever
merge
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simo
n
Haus
m
a
nn
More fixes in h
e
uris
t
i
c
p4 branch detection based on
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
S
imon
Hausm
a
nn
Starte
d
work on p4 branch detecti
o
n
(experimental!)
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausmann
C
ode clean
u
ps
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
Simon Haus
m
ann
Cleanups, remo
v
e unused
v
ari
a
bl
e
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
Si
m
on
H
ausmann
Cr
e
a
t
e
l
ightweight git ta
g
s (using the
"
res
e
t" tr
i
ck
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Simon Hausmann
Added a litt
l
e
h
el
p
e
r
script to
r
emove unuse
d
t
ags
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-10
Simon
Hau
s
mann
Change
d
the default git impor
t
branch from "p4"
t
o
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Simon Hau
s
m
a
nn
Avoid
the
excessive
u
se of git tags for every perforce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Simon H
a
u
s
man
n
M
inor cod
e
cleanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-08
S
i
m
on Hausmann
Added a little helper script to debug the
output of
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-08
Simon Hausmann
M
ade the name of the git
b
ranch used for the p
e
r
f
orce
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-08
S
i
mon Hausmann
Catc
h
io ex
c
eption
s
f
r
om git fa
s
t-impo
r
t again and
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon
H
a
u
s
mann
Fix calculatio
n
of the newest im
p
o
r
t
e
d revision
for
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon
Hausmann
M
ake sp
e
cifyin
g
t
h
e revisio
n
ranges more
c
onvenient
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon Hausmann
Make in
c
remental imports
e
asier to use by storing the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon Hausmann
Fixed incr
e
mental impo
r
ts by
using
t
he
c
orrect "from
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
S
imon Hausmann
Minor
c
l
e
a
n
ups and print a
n
er
r
or
m
ess
a
ge of git
f
ast
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
Simon Hausmann
Initial support
for importing a d
i
re
c
tory from
Pe
r
force
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
S
imon Hausmann
Code cleanups, move the
code to create a c
o
mmit
with
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
Simon Ha
u
smann
Simplify the incremental import by elimination the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
S
i
mon Hau
s
man
n
Started working on
i
ncremental imports f
r
om
P
erforce
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hau
s
m
ann
Fix file permissions of
p4-fast-export
.
py to be executable
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausma
n
n
Create
a
git ta
g
for every c
h
an
g
eset imported
from
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Haus
m
ann
Fixed di
s
p
l
aying import prog
r
ess
b
y cal
l
i
ng fl
u
sh on
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
S
i
m
on Hausma
n
n
Perm
i
t calling p4-fast-export with a depot
p
a
t
h
t
h
at
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
Avoid callin
g
fs
t
at
for every imported
file
(
s
low!
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simo
n
Haus
m
ann
Ported the remaining functions t
h
at parsed p4 sh
e
ll
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
Instead
o
f
parsing t
h
e
o
utput of "p4 users" use the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Sim
o
n
Hausmann
Min
o
r code cleanups
and por
t
ed some p4
interfacing
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Ha
u
sm
a
nn
Changed
t
he import mec
h
anis
m
t
o write to
g
it fast-im
p
ort
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
Removed unused p4cat func
t
ion and ad
d
ed helper
f
unction
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
next